Skip to content

feat: between rule for numeric types #174

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 5 commits into from
May 3, 2020
Merged

feat: between rule for numeric types #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0d8e32
Merge pull request #1 from laravel-shift/master
Pr3d4dor Apr 26, 2020
d3c1f91
Merge branch 'master' of github.com:laravel-shift/blueprint
Pr3d4dor Apr 30, 2020
cca756d
Merge branch 'master' of github.com:laravel-shift/blueprint
Pr3d4dor May 1, 2020
ae82160
Between rule for numeric types
Pr3d4dor May 2, 2020
0301e28
Removed default values for between rule
Pr3d4dor May 2, 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
40 changes: 40 additions & 0 deletions src/Translators/Rules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,18 @@ public static function fromColumn(string $context, Column $column)
array_push($rules, 'unique:' . $context . ',' . $column->name());
}

if (Str::contains($column->dataType(), 'decimal')) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These could all be refactored to in_array as the dataType will always been one of those.

array_push($rules, self::betweenRuleForNumericTypes($column, 'decimal'));
}

if (Str::contains($column->dataType(), 'float')) {
array_push($rules, self::betweenRuleForNumericTypes($column, 'float'));
}

if (Str::contains($column->dataType(), 'double')) {
array_push($rules, self::betweenRuleForNumericTypes($column, 'double'));
}

return $rules;
}

Expand All @@ -94,4 +106,32 @@ private static function overrideStringRuleForSpecialNames($name)

return 'string';
}


private static function betweenRuleForNumericTypes(Column $column, $numericType)
{
$parameters = explode(",", Str::between($column->dataType(), "$numericType:", " "));

if (count($parameters) === 1) {
return;
}

[$precision, $scale] = $parameters;

$max = substr_replace(str_pad("", $precision, '9'), ".", $precision - $scale, 0);
$min = "-" . $max;

if (intval($scale) === 0) {
$min = trim($min, ".");
$max = trim($max, ".");
}

if (Str::contains($column->dataType(), 'unsigned')) {
$min = '0';
}

$betweenRule = 'between:' . $min . ',' . $max;

return $betweenRule;
}
}
182 changes: 182 additions & 0 deletions tests/Feature/Translators/RulesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,156 @@ public function forColumn_return_json_rule_for_the_json_type()
$this->assertContains('json', Rules::fromColumn('context', $column));
}

/**
* @test
*/
public function forColumn_does_not_return_between_rule_for_decimal_without_precion_and_scale()
{
$column = new Column('column', "decimal");

$this->assertNotContains("between", Rules::fromColumn('context', $column));
}

/**
* @test
*/
public function forColumn_does_not_return_between_rule_for_unsigned_decimal_without_precion_and_scale()
{
$unsignedBeforeDecimalColumn = new Column('column', "unsigned decimal");

$this->assertNotContains("between", Rules::fromColumn('context', $unsignedBeforeDecimalColumn));

$unsignedAfterDecimalColumn = new Column('column', "decimal unsigned");

$this->assertNotContains("between", Rules::fromColumn('context', $unsignedAfterDecimalColumn));
}

/**
* @test
* @dataProvider numericDataProvider
*/
public function forColumn_return_between_rule_for_decimal($precision, $scale, $interval)
{
$column = new Column('column', "decimal:$precision,$scale");

$this->assertContains("between:$interval", Rules::fromColumn('context', $column));
}

/**
* @test
* @dataProvider unsignedNumericDataProvider
*/
public function forColumn_return_between_rule_for_unsigned_decimal($precision, $scale, $interval)
{
$unsignedBeforeDecimalColumn = new Column('column', "unsigned decimal:$precision,$scale");

$this->assertContains("between:$interval", Rules::fromColumn('context', $unsignedBeforeDecimalColumn));

$unsignedAfterDecimalColumn = new Column('column', "decimal:$precision,$scale unsigned");

$this->assertContains("between:$interval", Rules::fromColumn('context', $unsignedAfterDecimalColumn));
}

/**
* @test
*/
public function forColumn_does_not_return_between_rule_for_float_without_precion_and_scale()
{
$column = new Column('column', "float");

$this->assertNotContains("between", Rules::fromColumn('context', $column));
}

/**
* @test
*/
public function forColumn_does_not_return_between_rule_for_unsigned_float_without_precion_and_scale()
{
$unsignedBeforeFloatColumn = new Column('column', "unsigned float");

$this->assertNotContains("between", Rules::fromColumn('context', $unsignedBeforeFloatColumn));

$unsignedAfterFloatColumn = new Column('column', "float unsigned");

$this->assertNotContains("between", Rules::fromColumn('context', $unsignedAfterFloatColumn));
}

/**
* @test
* @dataProvider numericDataProvider
*/
public function forColumn_return_between_rule_for_float($precision, $scale, $interval)
{
$column = new Column('column', "float:$precision,$scale");

$this->assertContains("between:$interval", Rules::fromColumn('context', $column));
}

/**
* @test
* @dataProvider unsignedNumericDataProvider
*/
public function forColumn_return_between_rule_for_unsigned_float($precision, $scale, $interval)
{
$unsignedBeforeFloatColumn = new Column('column', "unsigned float:$precision,$scale");

$this->assertContains("between:$interval", Rules::fromColumn('context', $unsignedBeforeFloatColumn));

$unsignedAfterFloatColumn = new Column('column', "float:$precision,$scale unsigned");

$this->assertContains("between:$interval", Rules::fromColumn('context', $unsignedAfterFloatColumn));
}

/**
* @test
*/
public function forColumn_does_not_return_between_rule_for_double_without_precion_and_scale()
{
$column = new Column('column', "double");

$this->assertNotContains("between", Rules::fromColumn('context', $column));
}

/**
* @test
*/
public function forColumn_does_not_return_between_rule_for_unsigned_double_without_precion_and_scale()
{
$unsignedBeforeDoubleColumn = new Column('column', "unsigned double");

$this->assertNotContains("between", Rules::fromColumn('context', $unsignedBeforeDoubleColumn));

$unsignedAfterDoubleColumn = new Column('column', "double unsigned");

$this->assertNotContains("between", Rules::fromColumn('context', $unsignedAfterDoubleColumn));
}

/**
* @test
* @dataProvider numericDataProvider
*/
public function forColumn_return_between_rule_for_double($precision, $scale, $interval)
{
$column = new Column('column', "double:$precision,$scale");

$this->assertContains("between:$interval", Rules::fromColumn('context', $column));
}

/**
* @test
* @dataProvider unsignedNumericDataProvider
*/
public function forColumn_return_between_rule_for_unsigned_double($precision, $scale, $interval)
{
$unsignedBeforeDoubleColumn = new Column('column', "unsigned double:$precision,$scale");

$this->assertContains("between:$interval", Rules::fromColumn('context', $unsignedBeforeDoubleColumn));

$unsignedAfterDoubleColumn = new Column('column', "double:$precision,$scale unsigned");

$this->assertContains("between:$interval", Rules::fromColumn('context', $unsignedAfterDoubleColumn));
}

public function stringDataTypesProvider()
{
return [
Expand Down Expand Up @@ -225,4 +375,36 @@ public function relationshipColumnProvider()
['sheep_id', 'sheep'],
];
}

public function numericDataProvider()
{
return [
['10', '0', '-9999999999,9999999999'],
['10', '1', '-999999999.9,999999999.9'],
['10', '2', '-99999999.99,99999999.99'],
['10', '3', '-9999999.999,9999999.999'],
['10', '4', '-999999.9999,999999.9999'],
['10', '5', '-99999.99999,99999.99999'],
['10', '6', '-9999.999999,9999.999999'],
['10', '7', '-999.9999999,999.9999999'],
['10', '8', '-99.99999999,99.99999999'],
['10', '9', '-9.999999999,9.999999999'],
];
}

public function unsignedNumericDataProvider()
{
return [
['10', '0', '0,9999999999'],
['10', '1', '0,999999999.9'],
['10', '2', '0,99999999.99'],
['10', '3', '0,9999999.999'],
['10', '4', '0,999999.9999'],
['10', '5', '0,99999.99999'],
['10', '6', '0,9999.999999'],
['10', '7', '0,999.9999999'],
['10', '8', '0,99.99999999'],
['10', '9', '0,9.999999999'],
];
}
}