This commit is contained in:
+23
-5
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\TodoStatus;
|
||||
use Database\Factories\TodoFactory;
|
||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
@@ -16,13 +17,14 @@ use Illuminate\Support\Carbon;
|
||||
* @property int $folder_id
|
||||
* @property string $description
|
||||
* @property string|null $notes
|
||||
* @property TodoStatus $status
|
||||
* @property Carbon|null $due_date
|
||||
* @property Carbon|null $completed_at
|
||||
* @property Folder $folder
|
||||
* @property Carbon|null $created_at
|
||||
* @property Carbon|null $updated_at
|
||||
*/
|
||||
#[Fillable(['user_id', 'folder_id', 'description', 'notes', 'due_date', 'completed_at'])]
|
||||
#[Fillable(['user_id', 'folder_id', 'description', 'notes', 'status', 'due_date', 'completed_at'])]
|
||||
class Todo extends Model
|
||||
{
|
||||
/** @use HasFactory<TodoFactory> */
|
||||
@@ -50,6 +52,7 @@ class Todo extends Model
|
||||
return [
|
||||
'due_date' => 'date',
|
||||
'completed_at' => 'datetime',
|
||||
'status' => TodoStatus::class,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -87,24 +90,39 @@ class Todo extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
* Scope the query to open todos whose due date has already passed.
|
||||
* Scope the query to todos that still need attention: not completed
|
||||
* and not cancelled or deferred.
|
||||
*
|
||||
* @param Builder<Todo> $query
|
||||
* @return Builder<Todo>
|
||||
*/
|
||||
public function scopeActive(Builder $query): Builder
|
||||
{
|
||||
return $query->incomplete()->whereNotIn('status', [
|
||||
TodoStatus::Cancelled->value,
|
||||
TodoStatus::Deferred->value,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Scope the query to active todos whose due date has already passed.
|
||||
*
|
||||
* @param Builder<Todo> $query
|
||||
* @return Builder<Todo>
|
||||
*/
|
||||
public function scopeOverdue(Builder $query): Builder
|
||||
{
|
||||
return $query->incomplete()->whereDate('due_date', '<', now());
|
||||
return $query->active()->whereDate('due_date', '<', now());
|
||||
}
|
||||
|
||||
/**
|
||||
* Scope the query to open todos due today.
|
||||
* Scope the query to active todos due today.
|
||||
*
|
||||
* @param Builder<Todo> $query
|
||||
* @return Builder<Todo>
|
||||
*/
|
||||
public function scopeDueToday(Builder $query): Builder
|
||||
{
|
||||
return $query->incomplete()->whereDate('due_date', today());
|
||||
return $query->active()->whereDate('due_date', today());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user