diff --git a/app/Http/Controllers/API/SyncController.php b/app/Http/Controllers/API/SyncController.php index a77a79e..3264041 100644 --- a/app/Http/Controllers/API/SyncController.php +++ b/app/Http/Controllers/API/SyncController.php @@ -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 diff --git a/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php b/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php index bb42572..a83dae6 100644 --- a/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php +++ b/app/Http/Requests/Api/Contacts/UpsertContactsRequest.php @@ -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', diff --git a/app/Http/Resources/ContactResource.php b/app/Http/Resources/ContactResource.php index 94faa81..5113e12 100644 --- a/app/Http/Resources/ContactResource.php +++ b/app/Http/Resources/ContactResource.php @@ -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, diff --git a/app/Models/Contact.php b/app/Models/Contact.php index 49414e5..0884791 100644 --- a/app/Models/Contact.php +++ b/app/Models/Contact.php @@ -23,6 +23,7 @@ use Kwaadpepper\Enum\Traits\CastsEnums; * @property array<\App\Lib\Inputs\Definition\Input> $data * @property string|null $notes * @property array> $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' ]; diff --git a/database/migrations/2023_09_01_093430_add_timestamp_to_contacts.php b/database/migrations/2023_09_01_093430_add_timestamp_to_contacts.php new file mode 100644 index 0000000..52bc9dd --- /dev/null +++ b/database/migrations/2023_09_01_093430_add_timestamp_to_contacts.php @@ -0,0 +1,34 @@ +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'); + }); + } +}