From 515c19422d3e6de4d6bef081cda603234ff8e347 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Tue, 11 Jun 2019 14:55:25 +0200 Subject: [PATCH] improved fixture data for demo (#848) --- src/DataFixtures/CustomerFixtures.php | 7 ++++--- src/DataFixtures/TagFixtures.php | 6 ++---- src/DataFixtures/TimesheetFixtures.php | 16 +++++++++++----- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/DataFixtures/CustomerFixtures.php b/src/DataFixtures/CustomerFixtures.php index 5f65c94c..f0ddaed5 100644 --- a/src/DataFixtures/CustomerFixtures.php +++ b/src/DataFixtures/CustomerFixtures.php @@ -40,6 +40,7 @@ class CustomerFixtures extends Fixture public const MAX_PROJECTS_PER_CUSTOMER = 25; public const MIN_ACTIVITIES_PER_PROJECT = 0; public const MAX_ACTIVITIES_PER_PROJECT = 25; + public const INDICATE_HIDDEN = false; /** * @param ObjectManager $manager @@ -93,7 +94,7 @@ class CustomerFixtures extends Fixture $entry = new Customer(); $entry ->setCurrency($faker->currencyCode) - ->setName($faker->company . ($visible ? '' : ' (x)')) + ->setName($faker->company . (self::INDICATE_HIDDEN && !$visible ? ' (x)' : '')) ->setAddress($faker->address) ->setComment($faker->text) ->setNumber('C-' . $faker->ean8) @@ -124,7 +125,7 @@ class CustomerFixtures extends Fixture $entry = new Project(); $entry - ->setName($faker->catchPhrase . ($visible ? '' : ' (x)')) + ->setName($faker->catchPhrase . (self::INDICATE_HIDDEN && !$visible ? ' (x)' : '')) ->setComment($faker->text) ->setCustomer($customer) ->setVisible($visible) @@ -151,7 +152,7 @@ class CustomerFixtures extends Fixture { $entry = new Activity(); $entry - ->setName($faker->bs . ($visible ? '' : ' (x)')) + ->setName($faker->bs . (self::INDICATE_HIDDEN && !$visible ? ' (x)' : '')) ->setProject($project) ->setComment($faker->text) ->setVisible($visible) diff --git a/src/DataFixtures/TagFixtures.php b/src/DataFixtures/TagFixtures.php index 8277c14a..fca79cf2 100644 --- a/src/DataFixtures/TagFixtures.php +++ b/src/DataFixtures/TagFixtures.php @@ -49,8 +49,6 @@ class TagFixtures extends Fixture $tagName = $faker->firstName; } elseif ($i % 2 == 7) { $tagName = $faker->lastName; - } elseif ($i % 6 == 0) { - $tagName = $faker->iban(); } elseif ($i % 5 == 0) { $tagName = $faker->city; } elseif ($i % 4 == 0) { @@ -59,8 +57,8 @@ class TagFixtures extends Fixture $tagName = $faker->streetName; } elseif ($i % 2 == 0) { $tagName = $faker->colorName; - } elseif ($i % 1 == 0) { - $tagName = $faker->text(rand(5, 15)); + } else { + $tagName = $faker->text(rand(5, 10)); } if (in_array($tagName, $existing)) { diff --git a/src/DataFixtures/TimesheetFixtures.php b/src/DataFixtures/TimesheetFixtures.php index c88df41d..beaa796a 100644 --- a/src/DataFixtures/TimesheetFixtures.php +++ b/src/DataFixtures/TimesheetFixtures.php @@ -38,8 +38,11 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface public const MIN_RUNNING_TIMESHEETS_PER_USER = 0; public const MAX_RUNNING_TIMESHEETS_PER_USER = 3; public const TIMERANGE_DAYS = 1095; // 3 years + public const TIMERANGE_RUNNING = 1047; // in minutes = 17:45 hours public const MIN_MINUTES_PER_ENTRY = 15; public const MAX_MINUTES_PER_ENTRY = 840; // 14h + public const MAX_TAG_PER_ENTRY = 3; + public const MAX_DESCRIPTION_LENGTH = 50; public const BATCH_SIZE = 100; @@ -79,10 +82,10 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface } $description = null; - if ($i % 3 == 0) { - $description = $faker->text; - } elseif ($i % 7 == 0) { - $description = ''; + if ($i % 3 === 0) { + $description = $faker->realText($faker->numberBetween(10, self::MAX_DESCRIPTION_LENGTH)); + } elseif ($i % 7 === 0) { + $description = substr($faker->text, 0, self::MAX_DESCRIPTION_LENGTH); } $entry = $this->createTimesheetEntry( @@ -121,7 +124,7 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface $entries = $manager->getRepository(Timesheet::class)->findAll(); foreach ($entries as $temp) { - $tagAmount = rand(0, 4); + $tagAmount = rand(0, self::MAX_TAG_PER_ENTRY); for ($iTag = 0; $iTag < $tagAmount; $iTag++) { $tagId = rand(1, TagFixtures::MAX_TAGS); if (isset($allTags[$tagId])) { @@ -226,6 +229,9 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface ->setEnd($end) ->setRate($rate) ->setDuration($duration); + } else { + // running entries should be short + $entry->getBegin()->setTimestamp(time())->modify('- ' . rand(10, self::TIMERANGE_RUNNING) . ' minutes'); } return $entry;