feat: update organization types (#115)

* feat: add ngo type field * cleanup
code4romania · Oct 19, 2023 · e73d0bc · e73d0bc
1 parent c1140ad
commit e73d0bc
Show file tree

Hide file tree

Showing 18 changed files with 85 additions and 113 deletions.
diff --git a/app/Enum/NGOType.php b/app/Enum/NGOType.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enum;
+
+use App\Concerns\Enums\Arrayable;
+use App\Concerns\Enums\Comparable;
+use App\Concerns\Enums\HasLabel;
+
+enum NGOType: string
+{
+    use Arrayable;
+    use Comparable;
+    use HasLabel;
+
+    case association = 'association';
+    case foundation = 'foundation';
+    case federation = 'federation';
+
+    protected function labelKeyPrefix(): ?string
+    {
+        return 'organisation.field.ngo_types';
+    }
+}
diff --git a/app/Enum/OrganisationType.php b/app/Enum/OrganisationType.php
@@ -14,10 +14,10 @@ enum OrganisationType: string
     use Comparable;
     use HasLabel;
 
-    case association = 'association';
-    case foundation = 'foundation';
-    case federation = 'federation';
-    case informalGroup = 'informal_group';
+    case ngo = 'ngo';
+    case private = 'private';
+    case public = 'public';
+    case academic = 'academic';
 
     protected function labelKeyPrefix(): ?string
     {

diff --git a/app/Filament/Resources/OrganisationResource.php b/app/Filament/Resources/OrganisationResource.php
@@ -4,6 +4,7 @@
 
 namespace App\Filament\Resources;
 
+use App\Enum\NGOType;
 use App\Enum\OrganisationAreaType;
 use App\Enum\OrganisationType;
 use App\Filament\Forms\Components\Location;
@@ -78,6 +79,14 @@ public static function form(Form $form): Form
                                     ->label(__('organisation.field.type'))
                                     ->options(OrganisationType::options())
                                     ->enum(OrganisationType::class)
+                                    ->required()
+                                    ->reactive(),
+
+                                Select::make('ngo_type')
+                                    ->label(__('organisation.field.ngo_type'))
+                                    ->visible(fn (callable $get) => OrganisationType::ngo->is($get('type')))
+                                    ->options(NGOType::options())
+                                    ->enum(NGOType::class)
                                     ->required(),
 
                                 TextInput::make('year')

diff --git a/app/Filament/Resources/OrganisationResource/Pages/ListOrganisations.php b/app/Filament/Resources/OrganisationResource/Pages/ListOrganisations.php
@@ -4,6 +4,7 @@
 
 namespace App\Filament\Resources\OrganisationResource\Pages;
 
+use App\Enum\NGOType;
 use App\Enum\OrganisationType;
 use App\Filament\Forms\Components\Location;
 use App\Filament\Resources\OrganisationResource;
@@ -65,6 +66,15 @@ protected function getActions(): array
                         ->required()
                         ->options(OrganisationType::options())
                         ->enum(OrganisationType::class)
+                        ->reactive()
+                        ->inlineLabel(),
+
+                    Select::make('ngo_type')
+                        ->label(__('organisation.field.ngo_type'))
+                        ->required()
+                        ->visible(fn (callable $get) => OrganisationType::ngo->is($get('type')))
+                        ->options(NGOType::options())
+                        ->enum(NGOType::class)
                         ->inlineLabel(),
 
                     Location::make()

diff --git a/app/Filament/Resources/ProfileResource/Concerns/ResolvesRecord.php b/app/Filament/Resources/ProfileResource/Concerns/ResolvesRecord.php
@@ -10,6 +10,8 @@ public function mount($record = null): void
     {
         $this->record = auth()->user()->organisation;
 
+        abort_unless($this->record, 404);
+
         $this->fillForm();
     }
 }
diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
@@ -7,6 +7,7 @@
 use App\Concerns\HasLocation;
 use App\Concerns\LimitsVisibility;
 use App\Enum\DocumentType;
+use App\Enum\NGOType;
 use App\Enum\OrganisationAreaType;
 use App\Enum\OrganisationStatus;
 use App\Enum\OrganisationType;
@@ -51,6 +52,7 @@ public function registerMediaConversions(Media $media = null): void
         'name',
         'alias',
         'type',
+        'ngo_type',
         'status',
         'email',
         'phone',
@@ -70,6 +72,7 @@ public function registerMediaConversions(Media $media = null): void
     protected $casts = [
         'areas' => AsEnumCollection::class . ':' . OrganisationAreaType::class,
         'type' => OrganisationType::class,
+        'ngo_type' => NGOType::class,
         'status' => OrganisationStatus::class,
         'contact_person' => 'array',
         'other_information' => AsCollection::class,

diff --git a/database/factories/OrganisationFactory.php b/database/factories/OrganisationFactory.php
@@ -4,6 +4,7 @@
 
 namespace Database\Factories;
 
+use App\Enum\NGOType;
 use App\Enum\OrganisationAreaType;
 use App\Enum\OrganisationStatus;
 use App\Enum\OrganisationType;
@@ -40,11 +41,15 @@ public function definition()
 
         $city = City::query()->inRandomOrder()->first();
         $name = fake()->company();
+        $type = fake()->randomElement(OrganisationType::values());
 
         return [
             'name' => $name,
             'alias' => Str::slug($name),
-            'type' => fake()->randomElement(OrganisationType::values()),
+            'type' => $type,
+            'ngo_type' => OrganisationType::ngo->is($type)
+                ? fake()->randomElement(NGOType::values())
+                : null,
             'status' => fake()->randomElement(OrganisationStatus::values()),
             'email' => fake()->unique()->safeEmail(),
             'phone' => fake()->phoneNumber(),

diff --git a/database/migrations/2014_10_11_002425_create_organisations_table.php b/database/migrations/2014_10_11_002425_create_organisations_table.php
@@ -2,9 +2,6 @@
 
 declare(strict_types=1);
 
-use App\Enum\OrganisationAreaType;
-use App\Enum\OrganisationStatus;
-use App\Enum\OrganisationType;
 use App\Models\City;
 use App\Models\County;
 use Illuminate\Database\Migrations\Migration;
@@ -24,8 +21,9 @@ public function up()
             $table->id();
             $table->string('name');
             $table->string('alias')->nullable();
-            $table->enum('type', OrganisationType::values());
-            $table->enum('status', OrganisationStatus::values())->default('inactive');
+            $table->string('type');
+            $table->string('ngo_type')->nullable();
+            $table->string('status')->default('inactive');
             $table->string('email');
             $table->string('phone');
             $table->year('year')->nullable();
@@ -37,22 +35,12 @@ public function up()
             $table->text('description')->nullable();
             $table->json('contact_person')->nullable();
             $table->json('other_information')->nullable();
-            $table->enum('type_of_area', OrganisationAreaType::values());
+            $table->string('type_of_area')->nullable();
             $table->json('areas')->nullable();
             $table->boolean('has_branches')->default(false);
             $table->boolean('social_services_accreditation')->default(false);
             $table->softDeletes();
             $table->timestamps();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('organisations');
-    }
 };
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -21,14 +21,4 @@ public function up()
             $table->timestamp('created_at')->nullable();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('password_resets');
-    }
 };
diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
@@ -25,14 +25,4 @@ public function up()
             $table->timestamp('failed_at')->useCurrent();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('failed_jobs');
-    }
 };
diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php
@@ -26,14 +26,4 @@ public function up()
             $table->timestamps();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('personal_access_tokens');
-    }
 };
diff --git a/database/migrations/2023_01_27_143305_create_documents_table.php b/database/migrations/2023_01_27_143305_create_documents_table.php
@@ -26,14 +26,4 @@ public function up()
             $table->foreignIdFor(Organisation::class)->constrained()->cascadeOnDelete();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('documents');
-    }
 };
diff --git a/database/migrations/2023_05_04_014725_create_city_organisation_table.php b/database/migrations/2023_05_04_014725_create_city_organisation_table.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use App\Models\City;
+use App\Models\Organisation;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -17,19 +19,9 @@ public function up()
     {
         Schema::create('city_organisation', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(\App\Models\Organisation::class)->constrained()->cascadeOnDelete();
-            $table->foreignIdFor(\App\Models\City::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(Organisation::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(City::class)->constrained()->cascadeOnDelete();
             $table->timestamps();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('risk_categories');
-    }
 };
diff --git a/database/migrations/2023_05_04_014725_create_organisation_risk_category_table.php b/database/migrations/2023_05_04_014725_create_organisation_risk_category_table.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use App\Models\Organisation;
+use App\Models\Organisation\RiskCategory;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -17,19 +19,9 @@ public function up()
     {
         Schema::create('organisation_risk_category', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(\App\Models\Organisation::class)->constrained()->cascadeOnDelete();
-            $table->foreignIdFor(\App\Models\Organisation\RiskCategory::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(Organisation::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(RiskCategory::class)->constrained()->cascadeOnDelete();
             $table->timestamps();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('risk_categories');
-    }
 };
diff --git a/database/migrations/2023_05_04_023519_create_organisation_resource_type_table.php b/database/migrations/2023_05_04_023519_create_organisation_resource_type_table.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use App\Models\Organisation;
+use App\Models\Organisation\ResourceType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -17,19 +19,9 @@ public function up()
     {
         Schema::create('organisation_resource_type', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(\App\Models\Organisation::class)->constrained()->cascadeOnDelete();
-            $table->foreignIdFor(\App\Models\Organisation\ResourceType::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(Organisation::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(ResourceType::class)->constrained()->cascadeOnDelete();
             $table->timestamps();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('resource_types');
-    }
 };
diff --git a/database/migrations/2023_10_04_151611_add_two_factor_columns_to_table.php b/database/migrations/2023_10_04_151611_add_two_factor_columns_to_table.php
@@ -24,15 +24,4 @@ public function up()
                 ->nullable();
         });
     }
-
-    public function down()
-    {
-        Schema::table(config('filament-breezy.users_table'), function (Blueprint $table) {
-            $table->dropColumn([
-                'two_factor_secret',
-                'two_factor_recovery_codes',
-                'two_factor_confirmed_at',
-            ]);
-        });
-    }
 };
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -49,7 +49,6 @@ public function run()
                     'first_name' => 'Coordonator',
                     'last_name' => $county->name,
                     'email' => Str::slug($county->name) . '@example.com',
-                    'county_id' => $county->id,
                 ])->toArray()
             )
             ->create();

diff --git a/lang/ro/organisation.php b/lang/ro/organisation.php
@@ -17,6 +17,7 @@
         'name' => 'Denumire organizație',
         'alias' => 'Alias organizație',
         'type' => 'Tip organizație',
+        'ngo_type' => 'Tipul ONG-ului',
         'email_organisation' => 'Email de contact organizație',
         'phone_organisation' => 'Telefon de contact organizație',
         'year' => 'Anul înființării',
@@ -52,10 +53,15 @@
             'inactive' => 'Activeaza',
         ],
         'types' => [
-            'association' => 'Asociatie',
-            'foundation' => 'Fundatie',
-            'federation' => 'Federatie',
-            'informal_group' => 'Grup informal',
+            'ngo' => 'ONG',
+            'private' => 'Entitate privată',
+            'public' => 'Instituție publică',
+            'academic' => 'Mediu academic',
+        ],
+        'ngo_types' => [
+            'association' => 'Asociație',
+            'foundation' => 'Fundație',
+            'federation' => 'Federație',
         ],
         'area' => 'Organizația își desfășoară activitatea pe plan:',
         'area_of_activity' => [