kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix collection and message generation.

Browse Source
This commit is contained in:
James Cole
2025-08-20 06:38:53 +02:00
parent bcaa0bddea
commit 4ee9f9bb27
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Generator/Webhook/StandardMessageGenerator.php
View File

@@ -81,7 +81,12 @@ class StandardMessageGenerator implements MessageGeneratorInterface
private function getWebhooks(): Collection private function getWebhooks(): Collection
{ {
return $this->user->webhooks()->where('active', true)->where('trigger', $this->trigger)->get(['webhooks.*']); return $this->user->webhooks()
->leftJoin('webhook_webhook_trigger','webhook_webhook_trigger.webhook_id','webhooks.id')
->leftJoin('webhook_triggers','webhook_webhook_trigger.webhook_trigger_id','webhook_triggers.id')
->where('active', true)
->where('webhook_triggers.title', $this->trigger->name)
->get(['webhooks.*']);
} }
/** /**
@@ -164,23 +169,25 @@ class StandardMessageGenerator implements MessageGeneratorInterface
} }
// then depends on the response what to put in the message: // then depends on the response what to put in the message:
/** @var WebhookResponseModel $response */ /** @var WebhookResponseModel $webhookResponse */
$model = $webhook->webhookResponses()->first(); $webhookResponse = $webhook->webhookResponses()->first();
$response = $model->title; $response = $webhookResponse->title;
Log::debug(sprintf('Expected response for this webhook is "%s".', $response));
// if it's relevant, just switch to another. // if it's relevant, just switch to another.
if(WebhookResponse::RELEVANT->name === $response) { if(WebhookResponse::RELEVANT->name === $response) {
// switch to whatever is actually relevant. // switch to whatever is actually relevant.
$response = $relevantResponse; $response = $relevantResponse;
Log::debug(sprintf('Expected response for this webhook is now "%s".', $response));
} }
switch ($response) { switch ($response) {
default: default:
Log::error(sprintf('The response code for webhook #%d is "%d" and the message generator cant handle it. Soft fail.', $webhook->id, $webhook->response)); Log::error(sprintf('The response code for webhook #%d is "%s" and the message generator cant handle it. Soft fail.', $webhook->id, $webhook->response));
return; return;
case WebhookResponse::BUDGET->value: case WebhookResponse::BUDGET->name:
$basicMessage['content'] = []; $basicMessage['content'] = [];
if ($model instanceof Budget) { if ($model instanceof Budget) {
$enrichment = new BudgetEnrichment(); $enrichment = new BudgetEnrichment();
@@ -206,12 +213,12 @@ class StandardMessageGenerator implements MessageGeneratorInterface
break; break;
case WebhookResponse::NONE->value: case WebhookResponse::NONE->name:
$basicMessage['content'] = []; $basicMessage['content'] = [];
break; break;
case WebhookResponse::TRANSACTIONS->value: case WebhookResponse::TRANSACTIONS->name:
/** @var TransactionGroup $model */ /** @var TransactionGroup $model */
$transformer = new TransactionGroupTransformer(); $transformer = new TransactionGroupTransformer();
@@ -228,7 +235,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
break; break;
case WebhookResponse::ACCOUNTS->value: case WebhookResponse::ACCOUNTS->name:
/** @var TransactionGroup $model */ /** @var TransactionGroup $model */
$accounts = $this->collectAccounts($model); $accounts = $this->collectAccounts($model);
$enrichment = new AccountEnrichment(); $enrichment = new AccountEnrichment();