Add contact timestamp to allow keep most recent version of the contact
This commit is contained in:
parent
8bf14986d5
commit
40b0e79e73
5 changed files with 46 additions and 0 deletions
|
|
@ -24,6 +24,7 @@ use GuzzleHttp\Exception\ClientException;
|
|||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
|
|
@ -75,6 +76,12 @@ class SyncController extends Controller
|
|||
\collect($request->contacts)->each(function (array $contactRequestData) use ($contactQuery, $formularies) {
|
||||
/** @var \App\Models\Contact */
|
||||
$model = (clone $contactQuery)->where('id', Arr::get($contactRequestData, 'id'))->firstOrNew();
|
||||
|
||||
$contactRequestData['timestamp'] = Carbon::parse($contactRequestData['timestamp'], 'UTC')
|
||||
->setTimezone(\now()->getTimezone());
|
||||
if ($model->timestamp and $model->timestamp->gte($contactRequestData['timestamp'])) {
|
||||
return;
|
||||
}
|
||||
// * Set parse values on data prop to fill in model.
|
||||
$contactRequestData['data'] = \collect($contactRequestData['dataParsed'])
|
||||
// * FILTER CONTACT DATA WITH ACTUAL FORMULARY
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ class UpsertContactsRequest extends FormRequest
|
|||
// * Dot not validate email here (soft validate), if it does not pass, app will be blocked.
|
||||
'contacts.*.email' => 'required|string|max:255',
|
||||
'contacts.*.phone' => 'nullable|string|max:255',
|
||||
'contacts.*.timestamp' => 'required|date',
|
||||
|
||||
// * DATA
|
||||
'contacts.*.data' => 'present|array',
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ class ContactResource extends JsonResource
|
|||
'data' => $contact->data,
|
||||
'notes' => $contact->notes,
|
||||
'visits' => $contact->visits,
|
||||
'timestamp' => $contact->timestamp->toISOString(),
|
||||
'app_user_id' => $contact->app_user_id,
|
||||
'created_at' => $contact->created_at,
|
||||
'updated_at' => $contact->updated_at,
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ use Kwaadpepper\Enum\Traits\CastsEnums;
|
|||
* @property array<\App\Lib\Inputs\Definition\Input> $data
|
||||
* @property string|null $notes
|
||||
* @property array<array<string,string>> $visits
|
||||
* @property \Carbon\Carbon $timestamp
|
||||
*/
|
||||
class Contact extends Model
|
||||
{
|
||||
|
|
@ -43,6 +44,7 @@ class Contact extends Model
|
|||
'phone',
|
||||
'notes',
|
||||
'visits',
|
||||
'timestamp',
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -52,6 +54,7 @@ class Contact extends Model
|
|||
*/
|
||||
protected $casts = [
|
||||
'data' => AsArrayOfInput::class,
|
||||
'timestamp' => 'immutable_datetime',
|
||||
'visits' => 'array'
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class AddTimestampToContacts extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::table('contacts', function (Blueprint $table) {
|
||||
$table->timestamp('timestamp')
|
||||
->useCurrent()->after('visits')
|
||||
->comment('The mark when the contact was created, modified, or deleted on the App');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::table('contacts', function (Blueprint $table) {
|
||||
$table->dropColumn('timestamp');
|
||||
});
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue