Skip to content

Commit

Permalink
Fixed fome model issue
Browse files Browse the repository at this point in the history
  • Loading branch information
mshossain110 committed Aug 20, 2024
1 parent 7e3c637 commit 5b62650
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 14 deletions.
2 changes: 0 additions & 2 deletions app/Actions/CourseWithSections.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
namespace App\Actions;

use App\Http\Resources\CourseResource;
use App\Models\User;
use App\Models\Course;
use App\Models\Section;
use Illuminate\Support\Facades\Cache;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;

class CourseWithSections
Expand Down
2 changes: 1 addition & 1 deletion app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Handler extends ExceptionHandler
/**
* A list of the exception types that are not reported.
*
* @var array<int, string>
* @var array<int, string|null>
*/
protected $dontReport = [

Check failure on line 20 in app/Exceptions/Handler.php

View workflow job for this annotation

GitHub Actions / laravel-tests

PHPDoc type array<int, string|null> of property App\Exceptions\Handler::$dontReport is not covariant with PHPDoc type array<int, class-string<Throwable>> of overridden property Illuminate\Foundation\Exceptions\Handler::$dontReport.
//
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Resources/UserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public function toArray(Request $request): array
'email' => $this->email,
'avatar' => $this->avatar,
'email_verified_at' => $this->email_verified_at?->format('Y-m-d H:i:s'),
'created_at' => $this->created_at?->format('Y-m-d H:i:s'),
'updated_at' => $this->updated_at?->format('Y-m-d H:i:s'),
'created_at' => $this->created_at->format('Y-m-d H:i:s'),
'updated_at' => $this->updated_at->format('Y-m-d H:i:s'),
'deleted_at' => $this->deleted_at?->format('Y-m-d H:i:s'),
'roles' => RoleResource::collection($this->whenLoaded('roles')),
'results' => ResultResource::collection($this->whenLoaded('results')),
Expand Down
8 changes: 5 additions & 3 deletions app/Models/Course.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
namespace App\Models;

use App\Models\Exam;
use Illuminate\Support\Carbon;
use App\Models\Traits\Fileable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Database\Eloquent\Factories\HasFactory;

/**
* @property int $id
Expand Down
2 changes: 2 additions & 0 deletions app/Models/Exam.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
use App\Models\Result;
use App\Models\Subject;
use App\Models\Question;
use Illuminate\Support\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Factories\HasFactory;

Expand Down
6 changes: 4 additions & 2 deletions app/Models/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
namespace App\Models;

use App\Models\User;
use App\Models\Traits\HashesId;
use App\Jobs\ResizedImage;
use App\Models\Traits\FileStorage;
use Illuminate\Support\Carbon;
use App\Models\Traits\HashesId;
use App\Observers\FileObserver;
use App\Models\Traits\FileStorage;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Storage;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\SoftDeletes;

/**
Expand Down
4 changes: 3 additions & 1 deletion app/Models/Lesson.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@

use Auth;
use App\Models\File;
use Illuminate\Support\Carbon;
use App\Models\Traits\Fileable;
use App\Models\Traits\Topicable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Factories\HasFactory;

Expand Down Expand Up @@ -125,7 +127,7 @@ public function setStatusAttribute($value)
if ($key) {
$this->attributes['status'] = $value;
} else {
$this->attributes['status'] = self::$status[$value];
$this->attributes['status'] = self::$statuses[$value];
}
}

Expand Down
2 changes: 2 additions & 0 deletions app/Models/Question.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

use App\Models\Exam;
use App\Models\Topic;
use Illuminate\Support\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Factories\HasFactory;

Expand Down
4 changes: 3 additions & 1 deletion app/Models/Result.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

use App\Models\Exam;
use App\Models\User;
use Illuminate\Support\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;

/**
Expand Down Expand Up @@ -50,7 +52,7 @@ public static function calculateMark($answer)
foreach ($answer as $resultKey => $resultValue) {
$question = Question::where('id', $resultKey)->first();
if (!empty($question)) {
foreach ($question->answer as $key => $value) {
foreach ($question->answers as $key => $value) {
if ($resultValue == $value) {
$count = $count + $question->mark;
}
Expand Down
1 change: 1 addition & 0 deletions app/Models/Role.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
namespace App\Models;

use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Spatie\Permission\Models\Role as ModelsRole;

Expand Down
2 changes: 2 additions & 0 deletions app/Models/Section.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace App\Models;

use Illuminate\Support\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;

/**
Expand Down
2 changes: 2 additions & 0 deletions app/Models/Sectionable.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace App\Models;

use Illuminate\Support\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;

/**
Expand Down
2 changes: 2 additions & 0 deletions app/Models/Subject.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
namespace App\Models;

use App\Models\Exam;
use Illuminate\Support\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;

/**
Expand Down
3 changes: 3 additions & 0 deletions app/Models/Topic.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

namespace App\Models;

use Carbon\Carbon;
use App\Models\Exam;
use App\Models\Course;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;

/**
Expand Down
6 changes: 4 additions & 2 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

namespace App\Models;

use Carbon\Carbon;
use App\Models\Result;
use Laravel\Sanctum\HasApiTokens;
use App\Pivots\StudentCasting;
use Laravel\Sanctum\HasApiTokens;
use Spatie\Permission\Traits\HasRoles;
use Illuminate\Notifications\Notifiable;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
Expand All @@ -26,7 +28,7 @@
* @property string $fullName
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Carbon $deleted_at
* @property ?Carbon $deleted_at
* @property Collection<Role> $roles
* @property Collection<Result> $results
* @property Collection<Course> $instructCourses
Expand Down

0 comments on commit 5b62650

Please sign in to comment.