chore: commit remaining workspace changes
This commit is contained in:
170
app/Models/AcademyCourse.php
Normal file
170
app/Models/AcademyCourse.php
Normal file
@@ -0,0 +1,170 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
class AcademyCourse extends Model
|
||||
{
|
||||
use SoftDeletes;
|
||||
|
||||
public const STATUS_DRAFT = 'draft';
|
||||
public const STATUS_REVIEW = 'review';
|
||||
public const STATUS_PUBLISHED = 'published';
|
||||
public const STATUS_ARCHIVED = 'archived';
|
||||
|
||||
protected $fillable = [
|
||||
'title',
|
||||
'slug',
|
||||
'subtitle',
|
||||
'excerpt',
|
||||
'description',
|
||||
'cover_image',
|
||||
'teaser_image',
|
||||
'access_level',
|
||||
'difficulty',
|
||||
'status',
|
||||
'is_featured',
|
||||
'order_num',
|
||||
'estimated_minutes',
|
||||
'lessons_count_cache',
|
||||
'published_at',
|
||||
'seo_title',
|
||||
'seo_description',
|
||||
'meta_keywords',
|
||||
'og_title',
|
||||
'og_description',
|
||||
'og_image',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'is_featured' => 'boolean',
|
||||
'order_num' => 'integer',
|
||||
'estimated_minutes' => 'integer',
|
||||
'lessons_count_cache' => 'integer',
|
||||
'published_at' => 'datetime',
|
||||
];
|
||||
|
||||
public function scopePublished(Builder $query): Builder
|
||||
{
|
||||
return $query
|
||||
->where('status', self::STATUS_PUBLISHED)
|
||||
->where(function (Builder $builder): void {
|
||||
$builder->whereNull('published_at')->orWhere('published_at', '<=', now());
|
||||
});
|
||||
}
|
||||
|
||||
public function scopeFeatured(Builder $query): Builder
|
||||
{
|
||||
return $query->where('is_featured', true);
|
||||
}
|
||||
|
||||
public function scopeOrdered(Builder $query): Builder
|
||||
{
|
||||
return $query
|
||||
->orderByDesc('is_featured')
|
||||
->orderBy('order_num')
|
||||
->orderByDesc('published_at')
|
||||
->orderBy('id');
|
||||
}
|
||||
|
||||
public function scopeFree(Builder $query): Builder
|
||||
{
|
||||
return $query->where('access_level', 'free');
|
||||
}
|
||||
|
||||
public function scopePremium(Builder $query): Builder
|
||||
{
|
||||
return $query->where('access_level', 'premium');
|
||||
}
|
||||
|
||||
public function scopeMixed(Builder $query): Builder
|
||||
{
|
||||
return $query->where('access_level', 'mixed');
|
||||
}
|
||||
|
||||
public function sections(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademyCourseSection::class, 'course_id')
|
||||
->orderBy('order_num')
|
||||
->orderBy('id');
|
||||
}
|
||||
|
||||
public function courseLessons(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademyCourseLesson::class, 'course_id')
|
||||
->orderBy('order_num')
|
||||
->orderBy('id');
|
||||
}
|
||||
|
||||
public function lessons(): BelongsToMany
|
||||
{
|
||||
return $this->belongsToMany(AcademyLesson::class, 'academy_course_lessons', 'course_id', 'lesson_id')
|
||||
->using(AcademyCourseLesson::class)
|
||||
->withPivot(['section_id', 'order_num', 'is_required', 'access_override', 'unlock_after_lesson_id'])
|
||||
->withTimestamps()
|
||||
->orderBy('academy_course_lessons.order_num')
|
||||
->orderBy('academy_course_lessons.id');
|
||||
}
|
||||
|
||||
public function enrollments(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademyCourseEnrollment::class, 'course_id');
|
||||
}
|
||||
|
||||
public function isPublished(): bool
|
||||
{
|
||||
return (string) $this->status === self::STATUS_PUBLISHED
|
||||
&& ($this->published_at === null || $this->published_at->lte(now()));
|
||||
}
|
||||
|
||||
public function isFree(): bool
|
||||
{
|
||||
return (string) $this->access_level === 'free';
|
||||
}
|
||||
|
||||
public function isPremium(): bool
|
||||
{
|
||||
return (string) $this->access_level === 'premium';
|
||||
}
|
||||
|
||||
public function isMixed(): bool
|
||||
{
|
||||
return (string) $this->access_level === 'mixed';
|
||||
}
|
||||
|
||||
public function getPublicUrl(): string
|
||||
{
|
||||
return route('academy.courses.show', ['course' => $this->slug]);
|
||||
}
|
||||
|
||||
public function getContinueUrl(?User $user): string
|
||||
{
|
||||
$lastLesson = $user?->academyCourseEnrollments()
|
||||
->where('course_id', $this->id)
|
||||
->with('lastLesson')
|
||||
->first()?->lastLesson;
|
||||
|
||||
if ($lastLesson instanceof AcademyLesson) {
|
||||
return route('academy.courses.lessons.show', ['course' => $this->slug, 'lesson' => $lastLesson->slug]);
|
||||
}
|
||||
|
||||
$firstLesson = $this->courseLessons()
|
||||
->with('lesson')
|
||||
->get()
|
||||
->map(fn (AcademyCourseLesson $courseLesson): ?AcademyLesson => $courseLesson->lesson)
|
||||
->first(fn (?AcademyLesson $lesson): bool => $lesson instanceof AcademyLesson);
|
||||
|
||||
if ($firstLesson instanceof AcademyLesson) {
|
||||
return route('academy.courses.lessons.show', ['course' => $this->slug, 'lesson' => $firstLesson->slug]);
|
||||
}
|
||||
|
||||
return $this->getPublicUrl();
|
||||
}
|
||||
}
|
||||
44
app/Models/AcademyCourseEnrollment.php
Normal file
44
app/Models/AcademyCourseEnrollment.php
Normal file
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
class AcademyCourseEnrollment extends Model
|
||||
{
|
||||
public const STATUS_ACTIVE = 'active';
|
||||
public const STATUS_COMPLETED = 'completed';
|
||||
public const STATUS_PAUSED = 'paused';
|
||||
|
||||
protected $fillable = [
|
||||
'user_id',
|
||||
'course_id',
|
||||
'status',
|
||||
'last_lesson_id',
|
||||
'started_at',
|
||||
'completed_at',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'started_at' => 'datetime',
|
||||
'completed_at' => 'datetime',
|
||||
];
|
||||
|
||||
public function user(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id');
|
||||
}
|
||||
|
||||
public function course(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyCourse::class, 'course_id');
|
||||
}
|
||||
|
||||
public function lastLesson(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyLesson::class, 'last_lesson_id');
|
||||
}
|
||||
}
|
||||
50
app/Models/AcademyCourseLesson.php
Normal file
50
app/Models/AcademyCourseLesson.php
Normal file
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||
|
||||
class AcademyCourseLesson extends Pivot
|
||||
{
|
||||
protected $table = 'academy_course_lessons';
|
||||
|
||||
public $incrementing = true;
|
||||
|
||||
protected $fillable = [
|
||||
'course_id',
|
||||
'section_id',
|
||||
'lesson_id',
|
||||
'order_num',
|
||||
'is_required',
|
||||
'access_override',
|
||||
'unlock_after_lesson_id',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'order_num' => 'integer',
|
||||
'is_required' => 'boolean',
|
||||
];
|
||||
|
||||
public function course(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyCourse::class, 'course_id');
|
||||
}
|
||||
|
||||
public function section(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyCourseSection::class, 'section_id');
|
||||
}
|
||||
|
||||
public function lesson(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyLesson::class, 'lesson_id');
|
||||
}
|
||||
|
||||
public function unlockAfterLesson(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyLesson::class, 'unlock_after_lesson_id');
|
||||
}
|
||||
}
|
||||
49
app/Models/AcademyCourseSection.php
Normal file
49
app/Models/AcademyCourseSection.php
Normal file
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
|
||||
class AcademyCourseSection extends Model
|
||||
{
|
||||
protected $fillable = [
|
||||
'course_id',
|
||||
'title',
|
||||
'slug',
|
||||
'description',
|
||||
'order_num',
|
||||
'is_visible',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'order_num' => 'integer',
|
||||
'is_visible' => 'boolean',
|
||||
];
|
||||
|
||||
public function course(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyCourse::class, 'course_id');
|
||||
}
|
||||
|
||||
public function courseLessons(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademyCourseLesson::class, 'section_id')
|
||||
->orderBy('order_num')
|
||||
->orderBy('id');
|
||||
}
|
||||
|
||||
public function lessons(): BelongsToMany
|
||||
{
|
||||
return $this->belongsToMany(AcademyLesson::class, 'academy_course_lessons', 'section_id', 'lesson_id')
|
||||
->using(AcademyCourseLesson::class)
|
||||
->withPivot(['course_id', 'order_num', 'is_required', 'access_override', 'unlock_after_lesson_id'])
|
||||
->withTimestamps()
|
||||
->orderBy('academy_course_lessons.order_num')
|
||||
->orderBy('academy_course_lessons.id');
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
@@ -33,12 +34,18 @@ class AcademyLesson extends Model
|
||||
'category_id',
|
||||
'title',
|
||||
'slug',
|
||||
'lesson_number',
|
||||
'course_order',
|
||||
'series_name',
|
||||
'excerpt',
|
||||
'content',
|
||||
'content_markdown',
|
||||
'difficulty',
|
||||
'access_level',
|
||||
'lesson_type',
|
||||
'cover_image',
|
||||
'article_cover_image',
|
||||
'tags',
|
||||
'video_url',
|
||||
'reading_minutes',
|
||||
'featured',
|
||||
@@ -49,12 +56,20 @@ class AcademyLesson extends Model
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'lesson_number' => 'integer',
|
||||
'course_order' => 'integer',
|
||||
'tags' => 'array',
|
||||
'reading_minutes' => 'integer',
|
||||
'featured' => 'boolean',
|
||||
'active' => 'boolean',
|
||||
'published_at' => 'datetime',
|
||||
];
|
||||
|
||||
protected $appends = [
|
||||
'formatted_lesson_number',
|
||||
'lesson_label',
|
||||
];
|
||||
|
||||
public function scopeActive(Builder $query): Builder
|
||||
{
|
||||
return $query->where('active', true);
|
||||
@@ -65,6 +80,17 @@ class AcademyLesson extends Model
|
||||
return $query->whereNotNull('published_at')->where('published_at', '<=', now());
|
||||
}
|
||||
|
||||
public function scopeOrderedForCourse(Builder $query): Builder
|
||||
{
|
||||
return $query
|
||||
->orderByRaw('case when course_order is null then 1 else 0 end')
|
||||
->orderBy('course_order')
|
||||
->orderByRaw('case when lesson_number is null then 1 else 0 end')
|
||||
->orderBy('lesson_number')
|
||||
->orderByDesc('published_at')
|
||||
->orderBy('id');
|
||||
}
|
||||
|
||||
public function category(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyCategory::class, 'category_id');
|
||||
@@ -75,6 +101,23 @@ class AcademyLesson extends Model
|
||||
return $this->hasMany(AcademyLessonProgress::class, 'lesson_id');
|
||||
}
|
||||
|
||||
public function courseLessons(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademyCourseLesson::class, 'lesson_id')
|
||||
->orderBy('order_num')
|
||||
->orderBy('id');
|
||||
}
|
||||
|
||||
public function courses(): BelongsToMany
|
||||
{
|
||||
return $this->belongsToMany(AcademyCourse::class, 'academy_course_lessons', 'lesson_id', 'course_id')
|
||||
->using(AcademyCourseLesson::class)
|
||||
->withPivot(['section_id', 'order_num', 'is_required', 'access_override', 'unlock_after_lesson_id'])
|
||||
->withTimestamps()
|
||||
->orderBy('academy_course_lessons.order_num')
|
||||
->orderBy('academy_course_lessons.id');
|
||||
}
|
||||
|
||||
public function blocks(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademyLessonBlock::class, 'lesson_id')
|
||||
@@ -86,4 +129,30 @@ class AcademyLesson extends Model
|
||||
{
|
||||
return $this->blocks()->where('active', true);
|
||||
}
|
||||
|
||||
public function getFormattedLessonNumberAttribute(): ?string
|
||||
{
|
||||
if (! is_int($this->lesson_number) || $this->lesson_number < 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return sprintf('Lesson %02d', $this->lesson_number);
|
||||
}
|
||||
|
||||
public function getLessonLabelAttribute(): ?string
|
||||
{
|
||||
$formattedLessonNumber = $this->formatted_lesson_number;
|
||||
|
||||
if ($formattedLessonNumber === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$seriesName = trim((string) ($this->series_name ?? ''));
|
||||
|
||||
if ($seriesName === '') {
|
||||
return $formattedLessonNumber;
|
||||
}
|
||||
|
||||
return sprintf('%s · %s', $seriesName, $formattedLessonNumber);
|
||||
}
|
||||
}
|
||||
|
||||
32
app/Models/AcademyLessonRevision.php
Normal file
32
app/Models/AcademyLessonRevision.php
Normal file
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
class AcademyLessonRevision extends Model
|
||||
{
|
||||
protected $fillable = [
|
||||
'lesson_id',
|
||||
'user_id',
|
||||
'change_note',
|
||||
'snapshot_json',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'snapshot_json' => 'array',
|
||||
];
|
||||
|
||||
public function lesson(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(AcademyLesson::class, 'lesson_id');
|
||||
}
|
||||
|
||||
public function user(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id');
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,7 @@ use App\Models\SocialAccount;
|
||||
use App\Models\Conversation;
|
||||
use App\Models\ConversationParticipant;
|
||||
use App\Models\AcademyBadge;
|
||||
use App\Models\AcademyCourseEnrollment;
|
||||
use App\Models\AcademyChallengeSubmission;
|
||||
use App\Models\AcademyLessonProgress;
|
||||
use App\Models\AcademySavedPrompt;
|
||||
@@ -207,6 +208,11 @@ class User extends Authenticatable
|
||||
return $this->hasMany(AcademyLessonProgress::class, 'user_id');
|
||||
}
|
||||
|
||||
public function academyCourseEnrollments(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademyCourseEnrollment::class, 'user_id');
|
||||
}
|
||||
|
||||
public function academySavedPrompts(): HasMany
|
||||
{
|
||||
return $this->hasMany(AcademySavedPrompt::class, 'user_id');
|
||||
|
||||
Reference in New Issue
Block a user