Merge pull request #4 from TepuiLABS/upgrade-package-service-provider-from-spatie

 Fixed what needed fixing and squished some bugs.

Author: abr4xas

.github/workflows/phpstan.yml

@@ -1 +1 @@
-{"php":"8.1.3","version":"3.7.0","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Models\/Note.php":576988369,"src\/Models\/Service.php":589425630,"src\/Models\/Lead.php":1420902803,"src\/SimpleCrmServiceProvider.php":3677119947,"tests\/Unit\/LeadTest.php":820572205,"tests\/Unit\/ServiceTest.php":303507015,"tests\/Unit\/NoteTest.php":3367683590,"tests\/Models\/User.php":546769323,"tests\/TestCase.php":610046076,"tests\/Pest.php":2378833050,"src\/Models\/Enums\/ProjectStatus.php":240630045,"src\/Models\/Enums\/NoteStatus.php":780172828,"src\/Models\/Enums\/LeadStatus.php":2060495691,"src\/Models\/Project.php":705501016}}
+{"php":"8.1.8","version":"3.9.5","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/SimpleCrmServiceProvider.php":3677119947,"src\/Models\/Enums\/Lead\/LeadStatus.php":3241539491,"src\/Models\/Enums\/Lead\/LeadType.php":853698985,"src\/Models\/Enums\/NoteStatus.php":780172828,"src\/Models\/Enums\/LeadStatus.php":2060495691,"src\/Models\/Enums\/StatusEnum.php":3285058312,"src\/Models\/Enums\/ProjectStatus.php":240630045,"src\/Models\/Enums\/Note\/NotePriority.php":2745883000,"src\/Models\/Service.php":2530960531,"src\/Models\/Note.php":1930907653,"src\/Models\/Lead.php":491474045,"src\/Models\/Project.php":2605385879,"tests\/Pest.php":2378833050,"tests\/Unit\/ServiceTest.php":303507015,"tests\/Models\/User.php":2929405912,"tests\/TestCase.php":610046076}}

.php-cs-fixer.cache

@@ -2,71 +2,58 @@
 
 namespace Tepuilabs\SimpleCrm\Database\Factories;
 
-use Illuminate\Database\Eloquent\Model;
-use Tepuilabs\SimpleCrm\Models\Enums\LeadStatus;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Tepuilabs\SimpleCrm\Models\Enums\Lead\LeadStatus;
+use Tepuilabs\SimpleCrm\Models\Enums\Lead\LeadType;
 use Tepuilabs\SimpleCrm\Models\Lead;
 
 class LeadFactory extends Factory
 {
     /**
-     * The name of the factory's corresponding model.
-     *
-     * @var class-string<Model>
+     * {@inheritdoc}
      */
     protected $model = Lead::class;
 
     /**
-     * Define the model's default state.
-     *
-     * @return array
+     * {@inheritdoc}
      */
-    public function definition(): array
+    public function definition()
     {
         return [
             'name' => $this->faker->name,
             'email' => $this->faker->email,
-            'type' => $this->faker->randomElement([
-                LeadStatus::ORGANIC_TYPE(),
-                LeadStatus::USER_SUBMITTED_TYPE(),
-            ]),
-            'status' => $this->faker->randomElement([
-                LeadStatus::PROSPECT_STATUS(),
-                LeadStatus::LEAD_STATUS(),
-                LeadStatus::CUSTOMER_STATUS(),
-            ]),
         ];
     }
 
-    public function typeOrganic()
+    public function organicType(): LeadFactory
     {
         return $this->state([
-            'type' => LeadStatus::ORGANIC_TYPE()
+            'type' => LeadType::ORGANIC_TYPE(),
         ]);
     }
 
-    public function typeUserSubmitted()
+    public function userSubmittedType(): LeadFactory
     {
         return $this->state([
-            'type' => LeadStatus::USER_SUBMITTED_TYPE()
+            'type' => LeadType::USER_SUBMITTED_TYPE(),
         ]);
     }
 
-    public function statusProspect()
+    public function leadStatus(): LeadFactory
     {
         return $this->state([
-            'status' => LeadStatus::PROSPECT_STATUS()
+            'status' => LeadStatus::LEAD_STATUS()
         ]);
     }
 
-    public function statusLead()
+    public function prospectStatus(): LeadFactory
     {
         return $this->state([
-            'status' => LeadStatus::LEAD_STATUS()
+            'status' => LeadStatus::PROSPECT_STATUS()
         ]);
     }
 
-    public function statusCustomer()
+    public function customerStatus(): LeadFactory
     {
         return $this->state([
             'status' => LeadStatus::CUSTOMER_STATUS()

database/factories/LeadFactory.php

@@ -3,61 +3,53 @@
 namespace Tepuilabs\SimpleCrm\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Database\Eloquent\Model;
-use Tepuilabs\SimpleCrm\Models\Enums\NoteStatus;
+use Tepuilabs\SimpleCrm\Models\Enums\Note\NotePriority;
+use Tepuilabs\SimpleCrm\Models\Lead;
+use Tepuilabs\SimpleCrm\Models\Note;
+use Tepuilabs\SimpleCrm\Tests\Models\User;
 
 class NoteFactory extends Factory
 {
     /**
-     * The name of the factory's corresponding model.
-     *
-     * @var class-string<Model>
+     * {@inheritdoc}
      */
-    protected $model = \Tepuilabs\SimpleCrm\Models\Note::class;
-
+    protected $model = Note::class;
 
     /**
-     * Define the model's default state.
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function definition()
     {
-        $author = \Tepuilabs\SimpleCrm\Tests\Models\User::factory()->create();
-        $lead = \Tepuilabs\SimpleCrm\Models\Lead::factory()->create();
+        $author = User::factory()->create();
+        $lead = Lead::factory()->create();
 
         return [
-            'title' => $this->faker->word,
-            'body' => $this->faker->paragraphs(),
-            'priority' => $this->faker->randomElement([
-                NoteStatus::LOW_PRIORITY(),
-                NoteStatus::MEDIUM_PRIORITY(),
-                NoteStatus::HIGH_PRIORITY(),
-            ]),
+            'title' => $this->faker->sentence($nbWords = 6, $variableNbWords = true),
+            'body' => $this->faker->paragraphs($nb = 3, $asText = false),
             'lead_id' => $lead->id,
             'author_id' => $author->id,
             'author_type' => \Tepuilabs\SimpleCrm\Tests\Models\User::class,
         ];
     }
 
-    public function priorityLow()
+    public function lowPriority(): NoteFactory
     {
         return $this->state([
-            'priority' => NoteStatus::LOW_PRIORITY()
+            'priority' => NotePriority::LOW_PRIORITY()
         ]);
     }
 
-    public function priorityMedium()
+    public function mediumPriority(): NoteFactory
     {
         return $this->state([
-            'priority' => NoteStatus::MEDIUM_PRIORITY()
+            'priority' => NotePriority::MEDIUM_PRIORITY()
         ]);
     }
 
-    public function priorityHigh()
+    public function highPriority(): NoteFactory
     {
         return $this->state([
-            'priority' => NoteStatus::HIGH_PRIORITY()
+            'priority' => NotePriority::HIGH_PRIORITY()
         ]);
     }
 }

database/factories/NoteFactory.php

@@ -3,29 +3,28 @@
 namespace Tepuilabs\SimpleCrm\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Database\Eloquent\Model;
+use Tepuilabs\SimpleCrm\Models\Enums\StatusEnum;
 use Tepuilabs\SimpleCrm\Models\Service;
 
 class ServiceFactory extends Factory
 {
     /**
-     * The name of the factory's corresponding model.
-     *
-     * @var class-string<Model>
+     * {@inheritdoc}
      */
-    protected $model =  Service::class;
+    protected $model = Service::class;
 
     /**
-     * Define the model's default state.
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function definition(): array
     {
         return [
-            'name' => $this->faker->sentence(),
-            'description' => $this->faker->sentence(),
-            'status' => $this->faker->randomElement(['published', 'draft']),
+            'name' => $this->faker->sentence(6, true),
+            'description' => $this->faker->sentence(6, true),
+            'status' => $this->faker->randomElement([
+                StatusEnum::PUBLISHED(),
+                StatusEnum::DRAFT()
+            ]),
         ];
     }
 }

database/factories/ServiceFactory.php

@@ -20,6 +20,10 @@ class CreateNotesTable extends Migration
             $table->text('priority');
             $table->nullableMorphs('commentable');
             $table->nullableMorphs('author');
+            $table->foreignId('parent_id')
+                ->nullable()
+                ->constrained('comments')
+                ->onDelete('cascade');
             $table->timestamps();
             $table->softDeletes();
         });

database/migrations/create_notes_table.php.stub

@@ -17,7 +17,7 @@ class CreateServicesTable extends Migration
             $table->id();
             $table->string('name')->nullable();
             $table->text('description')->nullable();
-            $table->enum('status', ['published', 'draft'])->default('draft');
+            $table->enum('status', ['PUBLISHED', 'DRAFT'])->default('DRAFT');
             $table->timestamps();
             $table->softDeletes();
         });

database/migrations/create_services_table.php.stub

@@ -0,0 +1,25 @@
+<?php
+
+namespace Tepuilabs\SimpleCrm\Models\Enums\Lead;
+
+use Spatie\Enum\Laravel\Enum;
+
+/**
+ * @method static self PROSPECT_STATUS()
+ * @method static self LEAD_STATUS()
+ * @method static self CUSTOMER_STATUS()
+ */
+class LeadStatus extends Enum
+{
+    /**
+     * @return string
+     */
+    public function label(): string
+    {
+        return match ($this->value) {
+            self::PROSPECT_STATUS()->value => 'prospect',
+            self::LEAD_STATUS()->value => 'lead',
+            self::CUSTOMER_STATUS()->value => 'customer',
+        };
+    }
+}

src/Models/Enums/Lead/LeadStatus.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Tepuilabs\SimpleCrm\Models\Enums\Lead;
+
+use Spatie\Enum\Laravel\Enum;
+
+/**
+ * @method static self ORGANIC_TYPE()
+ * @method static self USER_SUBMITTED_TYPE()
+ */
+class LeadType extends Enum
+{
+    /**
+     * @return string
+     */
+    public function label(): string
+    {
+        return match ($this->value) {
+            self::ORGANIC_TYPE()->value => 'organic',
+            self::USER_SUBMITTED_TYPE()->value => 'user submitted',
+        };
+    }
+}

src/Models/Enums/Lead/LeadType.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Tepuilabs\SimpleCrm\Models\Enums\Note;
+
+use Spatie\Enum\Laravel\Enum;
+
+/**
+ * @method static self LOW_PRIORITY()
+ * @method static self MEDIUM_PRIORITY()
+ * @method static self HIGH_PRIORITY()
+ */
+class NotePriority extends Enum
+{
+    /**
+     * @return string
+     */
+    public function label(): string
+    {
+        return match ($this->value) {
+            self::LOW_PRIORITY()->value => 'low',
+            self::MEDIUM_PRIORITY()->value => 'medium',
+            self::HIGH_PRIORITY()->value => 'high',
+        };
+    }
+}