matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

106a6 integration performance issues (#581)

Browse Source 
* apply performance fixes

* fix integration

* Update client/components/open/forms/components/FirstSubmissionModal.vue

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix unique cache for forms

---------

Co-authored-by: Julien Nahum <julien@nahum.net>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
Favour Olayinka
2024-10-01 11:42:03 +01:00
committed by GitHub
parent 5346054584
commit dea8fe5741
3 changed files with 118 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/app/Http/Controllers/Integrations/Zapier/IntegrationController.php
View File

@@ -52,11 +52,15 @@ class IntegrationController
$this->authorize('view', $form);
$lastSubmission = $form->submissions()->latest()->first();
$submissionData = null;
if (!$lastSubmission) {
// Generate fake data when no previous submissions
$submissionData = (new FormSubmissionDataFactory($form))->asFormSubmissionData()->createSubmissionData();
}
$cacheKey = "zapier-poll-submissions-{$form->id}";
return (array) \Cache::remember($cacheKey, 60 * 5, function () use ($form, $submissionData, $lastSubmission) {
return [ZapierIntegration::formatWebhookData($form, $submissionData ?? $lastSubmission->data)];
});
return [ZapierIntegration::formatWebhookData($form, $submissionData ?? $lastSubmission->data)];
}
}

11
api/app/Integrations/Handlers/AbstractIntegrationHandler.php
View File

@@ -114,13 +114,12 @@ abstract class AbstractIntegrationHandler
// Old format - kept for retro-compatibility
$oldFormatData = [];
foreach ($formatter->getFieldsWithValue() as $field) {
$oldFormatData[$field['name']] = $field['value'];
}
// New format using ID
$formattedData = [];
foreach ($formatter->getFieldsWithValue() as $field) {
$fieldsWithValue = $formatter->getFieldsWithValue();
foreach ($fieldsWithValue as $field) {
$oldFormatData[$field['name']] = $field['value'];
// New format using ID
$formattedData[$field['id']] = [
'value' => $field['value'],
'name' => $field['name'],