Skip to content

fix: no rules generated for belongs to relationship #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 19, 2020
Merged

fix: no rules generated for belongs to relationship #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54e412c
Fix no rules generated for belongs to relationship
Pr3d4dor May 16, 2020
ae73826
BaseCoding
jasonmccreary May 19, 2020
c1a6b06
Fix method reference
jasonmccreary May 19, 2020
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: 1 addition & 1 deletion src/Generators/Statements/FormRequestGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private function validationRules(string $qualifier, string $column)
} else {
/** @var \Blueprint\Models\Model $column */
foreach ($model->columns() as $column) {
if ($column->dataType() === 'id') {
if ($column->name() === 'id') {
continue;
}

Expand Down
3 changes: 1 addition & 2 deletions src/Translators/Rules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ public static function fromColumn(string $context, Column $column)
}

if ($column->dataType() === 'id' && Str::endsWith($column->name(), '_id')) {
[$prefix, $field] = explode('_', $column->name());
$rules = array_merge($rules, ['integer', 'exists:' . Str::plural($prefix) . ',' . $field]);
$rules = array_merge($rules, ['integer', 'exists:' . Str::plural(Str::beforeLast($column->name(), '_id')) . ',id']);
}

if (in_array($column->dataType(), [
Expand Down
1 change: 0 additions & 1 deletion tests/Feature/Generator/Statements/FormRequestGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ public function it_respects_configuration()
$this->assertEquals(['created' => ['src/path/Http/Requests/PostStoreRequest.php']], $this->subject->output($tree));
}


/**
* @test
*/
Expand Down
3 changes: 2 additions & 1 deletion tests/fixtures/definitions/model-reference-validate.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
models:
Certificate:
name: string
certificate_type_id: id
reference: string
document: string
expiry_date: date
remarks: nullable text
remarks: text nullable

controllers:
Certificate:
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/form-requests/certificate-store.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function rules()
{
return [
'name' => 'required|string',
'certificate_type_id' => 'required|integer|exists:certificate_types,id',
'reference' => 'required|string',
'document' => 'required|string',
'expiry_date' => 'required|date',
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/form-requests/certificate-update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function rules()
{
return [
'name' => 'required|string',
'certificate_type_id' => 'required|integer|exists:certificate_types,id',
'reference' => 'required|string',
'document' => 'required|string',
'expiry_date' => 'required|date',
Expand Down