fix: minor fixes

starfolksoftware · Nov 8, 2022 · 9c8d891 · 9c8d891
1 parent 9c6964e
commit 9c8d891
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/src/FrequencyEnum.php b/src/FrequencyEnum.php
@@ -4,23 +4,23 @@
 
 enum FrequencyEnum: string
 {
- CASE SECONDLY = 'SECONDLY';
- CASE MINUTELY = 'MINUTELY';
- CASE HOURLY = 'HOURLY';
- CASE DAILY = 'DAILY';
- CASE WEEKLY = 'WEEKLY';
- CASE MONTHLY = 'MONTHLY';
- CASE YEARLY = 'YEARLY';
+ case SECOND = 'SECONDLY';
+ case MINUTE = 'MINUTELY';
+ case HOUR = 'HOURLY';
+ case DAY = 'DAILY';
+ case WEEK = 'WEEKLY';
+ case MONTH = 'MONTHLY';
+ case YEAR = 'YEARLY';
 
  /**
  * Returns the values in an array.
- * 
+ *
  * @return array
  */
  public static function toArray(): array
  {
  return collect(self::cases())
- ->map(fn ($selfObj) => $selfObj->value)
+ ->mapWithKeys(fn ($selfObj) => [$selfObj->value => $selfObj->name])
  ->toArray();
  }
-}
+}
diff --git a/src/Recurs.php b/src/Recurs.php
@@ -94,11 +94,12 @@ public function pauseRecurrence(bool $value = true)
  */
  public function recurrenceIsActive(): bool
  {
- return $this->recurrence->status === 'active' && (
- (!is_null($this->recurrence->ends_at) && ($this->recurrence->ends_at > now())) ||
- (!is_null($this->recurrence->ends_after) && $this->nextRecurrence()) ||
- (is_null($this->recurrence->ends_at) && is_null($this->recurrence->ends_after))
- );
+ return ($this->recurrence?->starts_at >= now()) &&
+ $this->recurrence?->status === 'active' && (
+ (! is_null($this->recurrence->ends_at) && ($this->recurrence->ends_at >= now())) ||
+ (! is_null($this->recurrence->ends_after) && $this->nextRecurrence()) ||
+ (is_null($this->recurrence->ends_at) && is_null($this->recurrence->ends_after))
+ );
  }
 
  /**
@@ -189,14 +190,15 @@ public function lastRecurrence()
 
  /**
  * Ensure provided frequency is supported.
- * 
- * @param string $frequency
+ *
+ * @param  string  $frequency
  * @return void
+ *
  * @throws \Exception
  */
  public function ensuresFrequencyIsSupported(string $frequency)
  {
- if (!FrequencyEnum::tryFrom($frequency)) {
+ if (! FrequencyEnum::tryFrom($frequency)) {
  throw new \Exception("{$frequency} is not supported by Redo(recurrence package)");
  }
  }

diff --git a/stubs/database/factories/RecurrenceFactory.php b/stubs/database/factories/RecurrenceFactory.php
@@ -1,22 +1,24 @@
 <?php
 
-namespace StarfolkSoftware\Gauge\Database\Factories;
+namespace Database\Factories;
 
-use App\Models\Recurrence;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Recurrence>
+ */
 class RecurrenceFactory extends Factory
 {
- protected $model = Recurrence::class;
-
+ /**
+ * Define the model's default state.
+ *
+ * @return array<string, mixed>
+ */
  public function definition()
  {
  return [
- 'team_id' => 1,
- 'recurrable_type' => 'App\\Models\\Task',
- 'recurrable_id' => 1,
  'frequency' => 'DAILY',
- 'starts_at' => now(),
+ 'starts_at' => now()->addHour(),
  ];
  }
 }
diff --git a/tests/RecursTest.php b/tests/RecursTest.php
@@ -9,7 +9,7 @@
 
  $task = Task::forceCreate(['title' => 'Task 1']);
 
- $startsAt = now();
+ $startsAt = now()->addHour();
 
  $task->makeRecurrable(
  frequency: 'DAILY',
@@ -34,7 +34,7 @@
 
  $task = Task::forceCreate(['title' => 'Task 1']);
 
- $startsAt = now();
+ $startsAt = now()->addHour();
 
  $task->makeRecurrable(
  frequency: 'DAILY',
@@ -62,7 +62,7 @@
 
  $task = Task::forceCreate(['title' => 'Task 1']);
 
- $startsAt = now();
+ $startsAt = now()->addHour();
 
  $task->makeRecurrable(
  frequency: 'DAILY',