[ADVAPP-209]: Refactor priorities so they are related to types rather than service requests

app-modules/prospect/src/Filament/Resources/ProspectResource/RelationManagers/ServiceRequestsRelationManager.php

@@ -45,7 +45,9 @@
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Filters\SelectFilter;
+use Illuminate\Database\Eloquent\Builder;
 use App\Filament\Resources\RelationManagers\RelationManager;
+use AdvisingApp\ServiceManagement\Models\ServiceRequestPriority;
 use AdvisingApp\ServiceManagement\Filament\Resources\ServiceRequestResource\Pages\ViewServiceRequest;
 use AdvisingApp\ServiceManagement\Filament\Resources\ServiceRequestResource\Pages\CreateServiceRequest;
 
@@ -84,7 +86,8 @@ public function table(Table $table): Table
             ])
             ->filters([
                 SelectFilter::make('priority')
-                    ->relationship('priority', 'name')
+                    ->relationship('priority', 'name', fn (Builder $query) => $query->with('type'))
+                    ->getOptionLabelFromRecordUsing(fn (ServiceRequestPriority $record) => "{$record->type->name} - {$record->name}")
                     ->multiple()
                     ->preload(),
                 SelectFilter::make('status')

app-modules/service-management/database/factories/ServiceRequestFactory.php

@@ -41,7 +41,6 @@
 use AdvisingApp\StudentDataModel\Models\Student;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use AdvisingApp\ServiceManagement\Models\ServiceRequest;
-use AdvisingApp\ServiceManagement\Models\ServiceRequestType;
 use AdvisingApp\ServiceManagement\Models\ServiceRequestStatus;
 use AdvisingApp\ServiceManagement\Models\ServiceRequestPriority;
 
@@ -61,7 +60,6 @@ public function definition(): array
             'res_details' => $this->faker->sentence(),
             'division_id' => Division::inRandomOrder()->first()?->id ?? Division::factory(),
             'status_id' => ServiceRequestStatus::inRandomOrder()->first() ?? ServiceRequestStatus::factory(),
-            'type_id' => ServiceRequestType::inRandomOrder()->first() ?? ServiceRequestType::factory(),
             'priority_id' => ServiceRequestPriority::inRandomOrder()->first() ?? ServiceRequestPriority::factory(),
             'created_by_id' => User::factory(),
         ];

app-modules/service-management/database/factories/ServiceRequestPriorityFactory.php

@@ -37,6 +37,7 @@
 namespace AdvisingApp\ServiceManagement\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
+use AdvisingApp\ServiceManagement\Models\ServiceRequestType;
 use AdvisingApp\ServiceManagement\Models\ServiceRequestPriority;
 
 /**
@@ -49,6 +50,7 @@ public function definition(): array
         return [
             'name' => $this->faker->name,
             'order' => $this->faker->randomNumber(1),
+            'type_id' => ServiceRequestType::factory(),
         ];
     }
 

app-modules/service-management/database/migrations/2023_09_05_143921_create_service_request_priorities_table.php

@@ -45,6 +45,7 @@ public function up(): void
             $table->uuid('id')->primary();
             $table->string('name');
             $table->integer('order');
+            $table->foreignUuid('type_id')->constrained('service_request_types')->cascadeOnDelete();
             $table->timestamps();
             $table->softDeletes();
         });

app-modules/service-management/database/migrations/2023_09_05_144251_create_service_requests_table.php

@@ -52,7 +52,6 @@ public function up(): void
 
             $table->foreignUuid('division_id')->nullable()->constrained('divisions');
             $table->foreignUuid('status_id')->nullable()->constrained('service_request_statuses');
-            $table->foreignUuid('type_id')->nullable()->constrained('service_request_types');
             $table->foreignUuid('priority_id')->nullable()->constrained('service_request_priorities');
             $table->foreignUuid('created_by_id')->nullable()->constrained('users');
 

app-modules/service-management/database/seeders/ServiceRequestTypeSeeder.php

@@ -60,6 +60,15 @@ public function run(): void
                     ['name' => 'Tutoring'],
                     ['name' => 'Veterans'],
                 ]
-            );
+            )
+            ->each(function (ServiceRequestType $type) {
+                $type->priorities()->createMany(
+                    [
+                        ['name' => 'High', 'order' => 1],
+                        ['name' => 'Medium', 'order' => 2],
+                        ['name' => 'Low', 'order' => 3],
+                    ]
+                );
+            });
     }
 }