Skip to content

Beautiful Open-Source Form Builder

Refactor StoreFormSubmissionJob for Improved Logic and Readability

JhumanJ48322cdc0c31
diff --git a/api/app/Jobs/Form/StoreFormSubmissionJob.php b/api/app/Jobs/Form/StoreFormSubmissionJob.php
index 870703126..f800c0441 100644
--- a/api/app/Jobs/Form/StoreFormSubmissionJob.php
+++ b/api/app/Jobs/Form/StoreFormSubmissionJob.php
@@ -179,10 +179,18 @@ class StoreFormSubmissionJob implements ShouldQueue
}
} else {
// Standard field processing (text, ID generation, etc.)
- if ((!$answerValue || !Str::isUuid($answerValue)) && $field['type'] == 'text' && isset($field['generates_uuid']) && $field['generates_uuid']) {
- $finalData[$field['id']] = ($this->form->is_pro) ? Str::uuid()->toString() : 'Please upgrade your OpenForm subscription to use our ID generation features';
- } elseif ((!$answerValue || !is_int($answerValue)) && $field['type'] == 'text' && isset($field['generates_auto_increment_id']) && $field['generates_auto_increment_id']) {
- $finalData[$field['id']] = ($this->form->is_pro) ? (string) ($this->form->submissions_count + 1) : 'Please upgrade your OpenForm subscription to use our ID generation features';
+ if (isset($field['generates_uuid']) && $field['generates_uuid'] && $field['type'] == 'text') {
+ if (empty($answerValue) || !Str::isUuid($answerValue)) {
+ $finalData[$field['id']] = ($this->form->is_pro) ? Str::uuid()->toString() : 'Please upgrade your OpenForm subscription to use our ID generation features';
+ } else {
+ $finalData[$field['id']] = $answerValue;
+ }
+ } elseif (isset($field['generates_auto_increment_id']) && $field['generates_auto_increment_id'] && $field['type'] == 'text') {
+ if (empty($answerValue) || !is_numeric($answerValue)) {
+ $finalData[$field['id']] = ($this->form->is_pro) ? (string)($this->form->submissions_count + 1) : 'Please upgrade your OpenForm subscription to use our ID generation features';
+ } else {
+ $finalData[$field['id']] = $answerValue;
+ }
} else {
$finalData[$field['id']] = $answerValue;
}
@@ -289,15 +297,31 @@ class StoreFormSubmissionJob implements ShouldQueue
private function addHiddenPrefills(array &$formData): void
{
collect($this->form->properties)->filter(function ($property) {
- return isset($property['hidden'])
- && isset($property['prefill'])
- && FormLogicPropertyResolver::isHidden($property, $this->submissionData)
- && !is_null($property['prefill'])
- && !in_array($property['type'], ['files'])
- && !($property['type'] == 'url' && isset($property['file_upload']) && $property['file_upload']);
+ return FormLogicPropertyResolver::isHidden($property, $this->submissionData);
})->each(function (array $property) use (&$formData) {
- // Do not override if a value is already set. We want to allow `0` and `false` as valid values.
- if (array_key_exists($property['id'], $formData) && $formData[$property['id']] !== '' && $formData[$property['id']] !== []) {
+ // If a value is already set, we don't do anything for this property
+ if (array_key_exists($property['id'], $formData) && $formData[$property['id']] !== '' && $formData[$property['id']] !== [] && !is_null($formData[$property['id']])) {
+ return;
+ }
+
+ // Handle ID Generation for text fields
+ if ($property['type'] == 'text') {
+ if (isset($property['generates_uuid']) && $property['generates_uuid']) {
+ $formData[$property['id']] = ($this->form->is_pro) ? Str::uuid()->toString() : 'Please upgrade your OpenForm subscription to use our ID generation features';
+ return; // ID generated, so we skip prefill logic for this field.
+ }
+
+ if (isset($property['generates_auto_increment_id']) && $property['generates_auto_increment_id']) {
+ $formData[$property['id']] = ($this->form->is_pro) ? (string)($this->form->submissions_count + 1) : 'Please upgrade your OpenForm subscription to use our ID generation features';
+ return; // ID generated, so we skip prefill logic for this field.
+ }
+ }
+
+ // From here, it's prefill logic.
+ if (!isset($property['prefill']) || is_null($property['prefill'])) {
+ return;
+ }
+ if (in_array($property['type'], ['files']) || ($property['type'] == 'url' && isset($property['file_upload']) && $property['file_upload'])) {
return;
}