Merge pull request #35 from tipoff/drewroberts/feature/31-contact-user

Contact User #31

Author: drewroberts

composer.json

@@ -19,7 +19,8 @@
         "dniccum/phone-number": "^1.1",
         "inspheric/nova-email-field": "^1.42",
         "tipoff/authorization": "^2.5.0",
-        "tipoff/support": "^1.5.10"
+        "tipoff/locations": "^2.5.1",
+        "tipoff/support": "^1.5.0"
     },
     "require-dev": {
         "tipoff/test-support": "^1.2.0"

database/factories/ContactFactory.php

@@ -9,27 +9,17 @@
 
 class ContactFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
     protected $model = Contact::class;
 
-    /**
-     * Define the model's default state.
-     *
-     * @return array
-     */
     public function definition()
     {
         return [
             'form_type'      => $this->faker->randomElement(['contact', 'reservation', 'parties', 'groups', 'employment']),
-            'user_id'        => randomOrCreate(app('user')),
             'location_id'    => randomOrCreate(app('location')),
+            'email'          => $this->faker->email,
+            'first_name'     => $this->faker->firstName,
+            'last_name'      => $this->faker->lastName,
             'phone'          => '555-555-5555',
-            'participants'   => $this->faker->numberBetween(10, 200),
-            'requested_date' => $this->faker->dateTimeBetween($startDate = 'now', $endDate = '+6 months')->format('Y-m-d'),
             'company_name'   => $this->faker->company,
             'message'        => $this->faker->paragraph,
         ];

database/migrations/2020_05_20_100000_create_contacts_table.php

@@ -14,17 +14,25 @@ public function up()
             $table->id();
             $table->string('form_type')->index(); // String title of the form type so know which one was completed
             $table->string('reference_number')->index()->unique(); // Generated by system. This is identifier used to communicate with customer about their contact form. Reference number is emailed to them.
-            $table->foreignIdFor(app('user'))->index(); // Will create a user for every form submission, so all need email, first & last name now.
             $table->foreignIdFor(app('location'))->index();
+            $table->string('email');
+            $table->foreignIdFor(app('user'))->nullable()->index();
+            $table->string('first_name')->nullable();
+            $table->string('last_name')->nullable();
+            $table->string('company_name')->nullable();
             $table->string('phone')->nullable(); // Will need to format before saving
+            $table->text('message')->nullable();
+            $table->json('additional_fields')->nullable();
+            
+            // Move application specific data to additonal_fields
             $table->smallInteger('participants')->nullable();
             $table->date('requested_date')->nullable();
             $table->time('requested_time')->nullable(); // Stored in location timezone
-            $table->string('company_name')->nullable();
-            $table->text('message')->nullable();
-            $table->json('additional_fields')->nullable();
+            
+            // Move response fields to different table (contact followup or something like that)
             $table->dateTime('emailed_at')->nullable();
             $table->dateTime('closed_at')->nullable();
+            
             $table->softDeletes(); // Soft delete if email bounces or if the contact submission is spam.
             $table->timestamps();
         });

src/Models/Contact.php

@@ -27,7 +27,6 @@ protected static function boot()
 
         static::creating(function ($contact) {
             Assert::lazy()
-                ->that($contact->user_id)->notEmpty('A contact must be made by a user.')
                 ->that($contact->location_id)->notEmpty('A contact must be made to a location.')
                 ->verifyNow();
             $contact->generateReferenceNumber();
@@ -48,25 +47,16 @@ public function generateReferenceNumber()
         $this->reference_number = $token;
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function user()
     {
         return $this->belongsTo(app('user'));
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
     public function location()
     {
         return $this->belongsTo(app('location'));
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
     public function notes()
     {
         return $this->morphMany(app('note'), 'noteable');

tests/TestCase.php

@@ -6,9 +6,11 @@
 
 use Laravel\Nova\NovaCoreServiceProvider;
 use Spatie\Permission\PermissionServiceProvider;
+use Tipoff\Addresses\AddressesServiceProvider;
 use Tipoff\Authorization\AuthorizationServiceProvider;
 use Tipoff\Forms\FormsServiceProvider;
 use Tipoff\Forms\Tests\Support\Providers\NovaPackageServiceProvider;
+use Tipoff\Locations\LocationsServiceProvider;
 use Tipoff\Support\SupportServiceProvider;
 use Tipoff\TestSupport\BaseTestCase;
 
@@ -18,8 +20,10 @@ protected function getPackageProviders($app)
     {
         return [
             SupportServiceProvider::class,
+            AddressesServiceProvider::class,
             AuthorizationServiceProvider::class,
             PermissionServiceProvider::class,
+            LocationsServiceProvider::class,
             FormsServiceProvider::class,
             NovaCoreServiceProvider::class,
             NovaPackageServiceProvider::class,