Update migrations #30

Author: chx2

database/migrations/2020_05_20_100000_create_contacts_table.php

@@ -12,7 +12,7 @@ public function up()
     {
         Schema::create('contacts', function (Blueprint $table) {
             $table->id();
-            $table->string('form_type')->index(); // String title of the form type so know which one was completed
+            $table->string('form_type')->index(); // Todo: Change this to enum?
             $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('location'))->index();
             $table->string('email');
@@ -22,17 +22,8 @@ public function up()
             $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
-            
-            // Move response fields to different table (contact followup or something like that)
-            $table->dateTime('emailed_at')->nullable();
-            $table->dateTime('closed_at')->nullable();
-            
+            $table->json('fields')->nullable();
+
             $table->softDeletes(); // Soft delete if email bounces or if the contact submission is spam.
             $table->timestamps();
         });

database/migrations/2021_03_20_153107_create_contact_followups_table.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Tipoff\Forms\Models\Contact;
+
+class CreateContactFollowupsTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('contact_followups', function (Blueprint $table) {
+            $table->id();
+            $table->foreignIdFor(Contact::class);
+            $table->dateTime('emailed_at')->nullable();
+            $table->dateTime('closed_at')->nullable();
+        });
+    }
+}

src/Models/Contact.php

@@ -24,6 +24,7 @@ class Contact extends BaseModel
     protected $casts = [
         'emailed_at' => 'datetime',
         'requested_date' => 'date',
+        'fields' => 'array',
     ];
 
     protected static function boot()
@@ -76,6 +77,11 @@ public function getContactStatusHistory(): Collection
         return $this->getStatusHistory(ContactStatus::statusType());
     }
 
+    public function followup()
+    {
+        return $this->hasOne(ContactFollowup::class);
+    }
+
     public function user()
     {
         return $this->belongsTo(app('user'));

src/Models/ContactFollowup.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tipoff\Forms\Models;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Tipoff\Support\Models\BaseModel;
+use Tipoff\Support\Traits\HasPackageFactory;
+
+class ContactFollowup extends BaseModel
+{
+    use HasPackageFactory;
+    use SoftDeletes;
+
+    public function contact()
+    {
+        return $this->belongsTo(Contact::class);
+    }
+}

src/Nova/Contact.php

@@ -83,9 +83,9 @@ protected function submissionFields()
     {
         return [
             Text::make('Number', 'reference_number')->exceptOnForms(),
-            Number::make('Participants')->nullable()->hideWhenUpdating(),
-            Date::make('Requested Date')->nullable()->hideWhenUpdating(),
-            Text::make('Requested Time')->nullable()->hideWhenUpdating(),
+            Number::make('Participants', 'fields->participants')->nullable()->hideWhenUpdating(),
+            Date::make('Requested Date', 'fields->requested_date')->nullable()->hideWhenUpdating(),
+            Text::make('Requested Time', 'fields->requested_time')->nullable()->hideWhenUpdating(),
             Text::make('Company Name')->nullable()->hideWhenUpdating(),
         ];
     }