Merge branch 'table-disciplina'

app/Models/Disciplina.php

+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Disciplina extends Model
+{
+    use HasFactory;
+
+    /**
+     * References table disciplinas
+     * 
+     * @var string
+     */
+    protected $table = 'disciplinas';
+
+    /**
+     * The attributes that are mass assignable.
+     * 
+     * @var array
+     */
+    protected $fillable = ['name', 'curso_id'];
+
+    /**
+     * Get Curso with curso.id = disciplinas.curso_id
+     * 
+     * @return Curso
+     */
+    public function curso()
+    {
+        return $this->belongsTo(Curso::class);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->name;
+    }
+    
+}

app/Queries/PlanejamentoQuery.php

@@ -16,7 +16,8 @@ class PlanejamentoQuery extends Query {
      * @return Builder
      */
     public function whereDimensao(int $dimensao, string $expression = '=') {
-        return $this->query->where('dimensao', $expression, $dimensao);
+        $this->query = $this->query->where('dimensao', $expression, $dimensao);
+        return $this->query;
     }
 
     /**
@@ -25,7 +26,8 @@ class PlanejamentoQuery extends Query {
      * @return Builder
      */
     public function whereCodDimensao(string $cod_dimensao, string $expression = '=') {
-        return $this->query->where('cod_dimensao', $expression, $cod_dimensao);
+        $this->query = $this->query->where('cod_dimensao', $expression, $cod_dimensao);
+        return $this->query;
     }
 
     /**
@@ -34,7 +36,8 @@ class PlanejamentoQuery extends Query {
      * @return Builder
      */
     public function whereInCodDimensao($codes_dimensao) {
-        return $this->query->whereIn('cod_dimensao', $codes_dimensao);
+        $this->query = $this->query->whereIn('cod_dimensao', $codes_dimensao);
+        return $this->query;
     }
 
-}
+}
\ No newline at end of file

database/migrations/2022_03_23_201201_create_disciplinas_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateDisciplinasTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('disciplinas', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->foreignId('curso_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('disciplinas');
+    }
+}

database/seeders/DatabaseSeeder.php

@@ -22,6 +22,7 @@ class DatabaseSeeder extends Seeder
             CursoSeeder::class,
             UserSeeder::class,
             PlanejamentoSeeder::class,
+            DisciplinaSeeder::class,
         ]);
     }
 }

database/seeders/DisciplinaSeeder.php

+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Curso;
+use App\Models\Disciplina;
+use Illuminate\Database\Seeder;
+
+class DisciplinaSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {   
+        $cursos = Curso::all();
+        $disciplinas = ['Disciplina A', 'Disciplina B', 'Disciplina C', 'Disciplina D', 'Disciplina E'];
+
+        foreach($cursos as $curso) {
+            foreach($disciplinas as $disciplina) {
+                Disciplina::create([
+                    'name' => $curso->name .' - '. $disciplina,
+                    'curso_id' => $curso->id,
+                ]);
+            }
+        }
+    }
+}