Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/custom-fields.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
'select' => \Givebutter\LaravelCustomFields\FieldTypes\SelectFieldType::class,
'textarea' => \Givebutter\LaravelCustomFields\FieldTypes\TextareaFieldType::class,
'text' => \Givebutter\LaravelCustomFields\FieldTypes\TextFieldType::class,
'multiselect' => \Givebutter\LaravelCustomFields\FieldTypes\MultiselectFieldType::class,
],

/*
Expand All @@ -47,6 +48,7 @@
'select' => \Givebutter\LaravelCustomFields\ResponseTypes\SelectResponseType::class,
'textarea' => \Givebutter\LaravelCustomFields\ResponseTypes\TextareaResponseType::class,
'text' => \Givebutter\LaravelCustomFields\ResponseTypes\TextResponseType::class,
'multiselect' => \Givebutter\LaravelCustomFields\ResponseTypes\MultiselectResponseType::class,
],

/*
Expand Down
10 changes: 10 additions & 0 deletions database/factories/CustomFieldFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ public function withTypeTextArea()
return $this;
}

/**
* @return $this
*/
public function withTypeMultiselect()
{
$this->model->type = CustomFieldType::MULTISELECT;

return $this;
}

/**
* @param $defaultValue
* @return $this
Expand Down
2 changes: 2 additions & 0 deletions src/Enums/CustomFieldType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ enum CustomFieldType: string
case SELECT = 'select';
case TEXT = 'text';
case TEXTAREA = 'textarea';
case MULTISELECT = 'multiselect';

public function requiresAnswers(): bool
{
return in_array($this, [
self::RADIO,
self::SELECT,
self::MULTISELECT,
]);
}
}
25 changes: 25 additions & 0 deletions src/FieldTypes/MultiselectFieldType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace Givebutter\LaravelCustomFields\FieldTypes;

use Illuminate\Validation\Rule;

class MultiselectFieldType extends FieldType
{
public function validationRules(array $attributes): array
{
return [
$this->validationPrefix.$this->field->id => [
$this->requiredRule($attributes['required']),
'array',
],
$this->validationPrefix.$this->field->id.'.*' => [
'required',
'distinct',
'string',
'max:255',
Rule::in($this->field->answers),
],
];
}
}
17 changes: 17 additions & 0 deletions src/ResponseTypes/MultiselectResponseType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Givebutter\LaravelCustomFields\ResponseTypes;

class MultiselectResponseType extends ResponseType
{
const VALUE_FIELD = 'value_json';

public function getValueFriendly(): string
{
if (is_null($this->getValue())) {
return '';
}

return implode(', ', $this->getValue());
}
}
93 changes: 93 additions & 0 deletions tests/Feature/CustomFieldControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,99 @@ function (TestCase $test, SurveyResponse $surveyResponse) {
];
}

/**
* @test
*/
public function multiselect_can_pass_validation(): void
{
$survey = Survey::create();
$survey->customfields()->save(
CustomField::factory()->make([
'title' => 'Favorite Album',
'type' => 'multiselect',
'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
])
);

Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey) {
$validator = $survey->validateCustomFields($request);

if ($validator->fails()) {
return ['errors' => $validator->errors()];
}

return response('All good', 200);
});

$fieldId = CustomField::where('title', 'Favorite Album')->value('id');

$this
->post("/surveys/{$survey->id}/responses", [
'custom_fields' => [
$fieldId => [
'Tha Carter',
'Tha Carter III',
],
],
])->assertSee('All good');
}

/**
* @test
*/
public function multiselect_can_overwrite_values(): void
{
$survey = Survey::create();
$surveyResponse = SurveyResponse::create();
$field = $survey->customfields()->save(
CustomField::factory()->make([
'title' => 'Favorite Album',
'type' => 'multiselect',
'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
])
);

Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey, $surveyResponse) {
$survey->validateCustomFields($request);

$surveyResponse->saveCustomFields($request->custom_fields);

return response('All good', 200);
});

// first time
$this
->post("/surveys/{$survey->id}/responses", [
'custom_fields' => [
$field->id => [
'Tha Carter II',
'Tha Carter III',
],
],
])->assertOk();

$this->assertSame(1, $field->responses()->count());
$this->assertSame([
'Tha Carter II',
'Tha Carter III',
], $field->responses()->first()->value);

// second time
$this
->post("/surveys/{$survey->id}/responses", [
'custom_fields' => [
$field->id => [
'Tha Carter I',
],
],
])->assertOk();

$this->assertSame(1, $field->responses()->count());
$this->assertSame([
'Tha Carter I',
], $field->responses()->first()->value);
}

/** @test */
public function fields_can_be_saved_from_request_with_convenience_method()
{
Expand Down