Consultations for n teachers (#110)

* Consultations for n teachers * Added tests
EscolaLMS · Oct 1, 2024 · 154530a · 154530a
1 parent aedf4f7
commit 154530a
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 10 deletions.
diff --git a/database/migrations/2024_09_27_053102_add_consultation_teacher_table.php b/database/migrations/2024_09_27_053102_add_consultation_teacher_table.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+ public function up()
+ {
+ Schema::create('consultation_teachers', function (Blueprint $table) {
+ $table->id();
+ $table->bigInteger('consultation_id')->unsigned()->index();
+ $table->bigInteger('teacher_id')->unsigned();
+
+ $table->foreign('consultation_id')->references('id')->on('consultations')->onDelete('CASCADE');
+ $table->foreign('teacher_id')->references('id')->on('users')->onDelete('CASCADE');
+ });
+ }
+
+ public function down()
+ {
+ Schema::dropIfExists('consultation_teachers');
+ }
+};
diff --git a/src/Dto/ConsultationDto.php b/src/Dto/ConsultationDto.php
@@ -87,4 +87,9 @@ protected function setActiveFrom(?string $activeFrom): void
  {
  $this->activeFrom = $activeFrom ? Carbon::make($activeFrom) : null;
  }
+
+ protected function setTeachers(array $teachers): void
+ {
+ $this->relations['teachers'] = $teachers;
+ }
 }
diff --git a/src/Http/Requests/StoreConsultationRequest.php b/src/Http/Requests/StoreConsultationRequest.php
@@ -32,6 +32,8 @@ public function rules(): array
  'categories' => ['array'],
  'categories.*' => ['integer', 'exists:categories,id'],
  'max_session_students' => ['integer', 'min:1', 'max:99'],
+ 'teachers' => ['array'],
+ 'teachers.*' => ['integer', 'exists:users,id'],
  ], ModelFields::getFieldsMetadataRules(Consultation::class));
  }
 }
diff --git a/src/Http/Requests/UpdateConsultationRequest.php b/src/Http/Requests/UpdateConsultationRequest.php
@@ -35,6 +35,8 @@ public function rules(): array
  'categories' => ['array'],
  'categories.*' => ['integer', 'exists:categories,id'],
  'max_session_students' => ['integer', 'min:1', 'max:99'],
+ 'teachers' => ['array'],
+ 'teachers.*' => ['integer', 'exists:users,id'],
  ], ModelFields::getFieldsMetadataRules(Consultation::class));
  }
 }
diff --git a/src/Http/Resources/ConsultationSimpleResource.php b/src/Http/Resources/ConsultationSimpleResource.php
@@ -36,6 +36,7 @@ public function toArray($request)
  'busy_terms' => ConsultationTermResource::collection($consultationServiceContract->getBusyTermsFormatDate($this->resource->getKey())),
  'categories' => $this->resource->categories,
  'max_session_students' => $this->resource->max_session_students,
+ 'teachers' => ConsultationAuthorResource::collection($this->resource->teachers),
  ...ModelFields::getExtraAttributesValues($this->resource, MetaFieldVisibilityEnum::PUBLIC)
  ];
  return self::apply($fields, $this);

diff --git a/src/Models/Consultation.php b/src/Models/Consultation.php
@@ -196,6 +196,11 @@ public function users(): BelongsToMany
  return $this->belongsToMany(User::class, 'consultation_user');
  }
 
+ public function teachers(): BelongsToMany
+ {
+ return $this->belongsToMany(User::class, 'consultation_teachers', 'consultation_id', 'teacher_id');
+ }
+
  public function proposedTerms(): HasMany
  {
  return $this->hasMany(ConsultationProposedTerm::class, 'consultation_id');

diff --git a/src/Repositories/ConsultationUserRepository.php b/src/Repositories/ConsultationUserRepository.php
@@ -57,9 +57,11 @@ public function getIncomingTerm(array $criteria = []): Collection
 
  public function getByCurrentUserTutor(): Collection
  {
- $query = $this->model->newQuery();
- $query->whereHas('consultation', fn (Builder $query) => $query->whereAuthorId(auth()->user()->getKey()));
- return $query->get();
+ return $this->model->newQuery()
+ ->whereHas('consultation', fn (Builder $query) => $query
+ ->whereAuthorId(auth()->user()->getKey())
+ ->orWhereHas('teachers', fn (Builder $query) => $query->where('users.id', '=', auth()->user()->getKey()))
+ )->get();
  }
 
  public function getBusyTerms(int $consultationId, ?string $date = null): Collection

diff --git a/src/Services/ConsultationService.php b/src/Services/ConsultationService.php
@@ -190,7 +190,7 @@ public function generateJitsi(int $consultationTermId): array
  $isModerator = false;
  $configOverwrite = [];
  $configInterface = [];
- if ($consultationTerm->consultation->author->getKey() === auth()->user()->getKey()) {
+ if ($consultationTerm->consultation->author->getKey() === auth()->user()->getKey() || in_array(auth()->user()->getKey(), $consultationTerm->consultation->teachers()->pluck('id')->toArray())) {
  $configOverwrite = [
  "disableModeratorIndicator" => true,
  "startScreenSharing" => false,
@@ -236,7 +236,7 @@ public function generateJitsiUrlForEmail(int $consultationTermId, int $userId):
  $isModerator = false;
  $configOverwrite = [];
  $configInterface = [];
- if ($consultationTerm->consultation->author->getKey() === $userId) {
+ if ($consultationTerm->consultation->author->getKey() === $userId || in_array($userId, $consultationTerm->consultation->teachers()->pluck('id')->toArray())) {
  $configOverwrite = [
  "disableModeratorIndicator" => true,
  "startScreenSharing" => false,
@@ -383,11 +383,21 @@ public function reminderAboutConsultation(string $reminderStatus): void
  $consultationTerm,
  $reminderStatus
  ));
- event(new ReminderTrainerAboutTerm(
- $consultationTerm->consultation->author,
- $consultationTerm,
- $reminderStatus
- ));
+ if ($consultationTerm->consultation->teachers) {
+ $consultationTerm->consultation->teachers->each(
+ fn (User $teacher) => event(new ReminderTrainerAboutTerm(
+ $teacher,
+ $consultationTerm,
+ $reminderStatus
+ ))
+ );
+ } else {
+ event(new ReminderTrainerAboutTerm(
+ $consultationTerm->consultation->author,
+ $consultationTerm,
+ $reminderStatus
+ ));
+ }
  }
  }
 

diff --git a/src/Strategies/Relations/ConsultationWithTeachersStrategy.php b/src/Strategies/Relations/ConsultationWithTeachersStrategy.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace EscolaLms\Consultations\Strategies\Relations;
+
+use EscolaLms\Consultations\Models\Consultation;
+use EscolaLms\Consultations\Strategies\Contracts\RelationStrategyContract;
+
+class ConsultationWithTeachersStrategy implements RelationStrategyContract
+{
+ private Consultation $consultation;
+ private array $data;
+
+ public function __construct(array $params) {
+ $this->consultation = $params[0];
+ $this->data = $params[1] ?? [];
+ }
+
+ public function setRelation(): void
+ {
+ $this->consultation->teachers()->sync($this->data['teachers']);
+ }
+}
diff --git a/tests/APIs/ConsultationStoreApiTest.php b/tests/APIs/ConsultationStoreApiTest.php
@@ -56,13 +56,15 @@ public function testConsultationStore(): void
  now()->modify('+1 day')->format("Y-m-d\TH:i:s.000000\Z")
  ];
  $categories = Category::factory(2)->create()->pluck('id')->toArray();
+ $teachers = User::factory()->count(4)->create();
  $requestArray = array_merge(
  $consultationArr,
  ['proposed_terms' => $proposedTerms],
  ['image' => UploadedFile::fake()->image('image.jpg')],
  ['logotype' => UploadedFile::fake()->image('image.jpg')],
  ['categories' => $categories],
  ['max_session_students' => 5],
+ ['teachers' => $teachers->pluck('id')->toArray()],
  );
  $response = $this->actingAs($this->user, 'api')->json(
  'POST',
@@ -99,6 +101,7 @@ public function testConsultationStore(): void
  )
  ->etc()
  );
+ $response->assertJsonCount(4, 'data.teachers');
  }
 
  public function testConsultationStoreWithModelFields(): void

diff --git a/tests/APIs/ConsultationUpdateApiTest.php b/tests/APIs/ConsultationUpdateApiTest.php
@@ -77,12 +77,14 @@ public function testConsultationUpdate(): void
  $consultationUpdateArray = $consultationUpdate->toArray();
  $this->assertTrue(!isset($consultation['image_path']));
  $categories = Category::factory(2)->create()->pluck('id')->toArray();
+ $teachers = User::factory()->count(4)->create();
  $requestArray = array_merge(
  $consultationUpdateArray,
  ['proposed_terms' => $proposedTerms],
  ['image' => UploadedFile::fake()->image('image.jpg')],
  ['categories' => $categories],
  ['max_session_students' => 4],
+ ['teachers' => $teachers->pluck('id')->toArray()],
  );
  $response = $this->actingAs($this->user, 'api')->json(
  'POST',
@@ -118,6 +120,7 @@ public function testConsultationUpdate(): void
  'proposed_terms' => $proposedTerms
  ]);
  $response->assertJsonFragment(['success' => true]);
+ $response->assertJsonCount(4, 'data.teachers');
  }
 
  public function testConsultationUpdateSingleField(): void