IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-18 17:04:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure webhook messages are sent.

Browse Source
This commit is contained in:
James Cole
2026-02-06 06:04:52 +01:00
parent 9811583379
commit 4e7d12f06b
7 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Api/V1/Controllers/Models/Transaction/UpdateController.php
+4
View File
@@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\Models\Transaction\UpdateRequest;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
@@ -92,6 +93,9 @@ class UpdateController extends Controller
$flags->fireWebhooks = $fireWebhooks;
$flags->recalculateCredit = $runRecalculations;
event(new UpdatedSingleTransactionGroup($flags, $objects));
if($flags->fireWebhooks) {
event(new WebhookMessagesRequestSending());
}
/** @var User $admin */
$admin = auth()->user();
app/Console/Commands/Correction/CorrectsGroupAccounts.php
+2 -1
View File
@@ -28,6 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
@@ -64,7 +65,7 @@ class CorrectsGroupAccounts extends Command
$objects->appendFromTransactionGroup($group);
}
event(new UpdatedSingleTransactionGroup($flags, $objects));
event(new WebhookMessagesRequestSending());
return 0;
}
}
app/Http/Controllers/Transaction/BulkController.php
+3
View File
@@ -27,6 +27,7 @@ namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BulkEditJournalRequest;
use FireflyIII\Models\TransactionJournal;
@@ -126,6 +127,8 @@ class BulkController extends Controller
$objects->appendFromTransactionGroup($journal->transactionGroup);
}
event(new UpdatedSingleTransactionGroup($flags, $objects));
event(new WebhookMessagesRequestSending());
Preferences::mark();
$request->session()->flash('success', trans_choice('firefly.mass_edited_transactions_success', $count));
app/Http/Controllers/Transaction/ConvertController.php
+3
View File
@@ -29,6 +29,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
@@ -310,6 +311,8 @@ class ConvertController extends Controller
$flags = new TransactionGroupEventFlags();
$objects = TransactionGroupEventObjects::collectFromTransactionGroup($group);
event(new UpdatedSingleTransactionGroup($flags, $objects));
event(new WebhookMessagesRequestSending());
return redirect(route('transactions.show', [$group->id]));
}
app/Http/Controllers/Transaction/MassController.php
+3 -3
View File
@@ -29,6 +29,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\MassDeleteJournalRequest;
@@ -221,12 +222,11 @@ class MassController extends Controller
// call service to update.
$service->setData($data);
$service->update();
// trigger rules
$runRecalculations = $service->isCompareHashChanged();
$flags = new TransactionGroupEventFlags();
$flags->recalculateCredit = $runRecalculations;
$objects = TransactionGroupEventObjects::collectFromTransactionGroup($journal->transactionGroup);
event(new UpdatedSingleTransactionGroup($flags, $objects));
event(new WebhookMessagesRequestSending());
}
private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon
app/Repositories/TransactionGroup/TransactionGroupRepository.php
+4 -2
View File
@@ -421,8 +421,10 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
$flags->fireWebhooks = $data['fire_webhooks'] ?? true;
$flags->batchSubmission = $data['batch_submission'] ?? false;
event(new CreatedSingleTransactionGroup($flags, $objects));
Log::debug(sprintf('send event WebhookMessagesRequestSending from %s', __METHOD__));
event(new WebhookMessagesRequestSending());
if($flags->fireWebhooks) {
Log::debug(sprintf('send event WebhookMessagesRequestSending from %s', __METHOD__));
event(new WebhookMessagesRequestSending());
}
return $transactionGroup;
}
app/Services/Internal/Destroy/TransactionGroupDestroyService.php
+2
View File
@@ -27,6 +27,7 @@ namespace FireflyIII\Services\Internal\Destroy;
use FireflyIII\Events\Model\TransactionGroup\DestroyedSingleTransactionGroup;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
use FireflyIII\Models\TransactionGroup;
use Illuminate\Support\Facades\Log;
@@ -49,5 +50,6 @@ class TransactionGroupDestroyService
// trigger just after destruction
$flags = new TransactionGroupEventFlags();
event(new DestroyedSingleTransactionGroup($flags, $objects));
event(new WebhookMessagesRequestSending());
}
}