feat: make archived contact readonly (#5285)

monicahq · Jun 22, 2021 · a3fdac9 · a3fdac9
1 parent 99bd8e1
commit a3fdac9
Show file tree

Hide file tree

Showing 70 changed files with 376 additions and 43 deletions.
diff --git a/app/Http/Controllers/Contacts/AvatarController.php b/app/Http/Controllers/Contacts/AvatarController.php
@@ -16,6 +16,8 @@ class AvatarController extends Controller
      */
     public function edit(Contact $contact)
     {
+        $contact->throwInactive();
+
         return view('people.avatar.edit')
             ->withContact($contact);
     }

diff --git a/app/Http/Controllers/Contacts/CallsController.php b/app/Http/Controllers/Contacts/CallsController.php
@@ -84,12 +84,8 @@ public function destroy(Request $request, Contact $contact, Call $call): ?JsonRe
             'call_id' => $call->id,
         ];
 
-        try {
-            if (app(DestroyCall::class)->execute($data)) {
-                return $this->respondObjectDeleted($call->id);
-            }
-        } catch (\Exception $e) {
-            return $this->respondNotFound();
+        if (app(DestroyCall::class)->execute($data)) {
+            return $this->respondObjectDeleted($call->id);
         }
 
         return null;

diff --git a/app/Http/Controllers/Contacts/ConversationsController.php b/app/Http/Controllers/Contacts/ConversationsController.php
@@ -118,6 +118,8 @@ public function store(Request $request, Contact $contact)
      */
     public function edit(Request $request, Contact $contact, Conversation $conversation)
     {
+        $contact->throwInactive();
+
         // preparing the messages for the Vue component
         $messages = collect([]);
         foreach ($conversation->messages as $message) {

diff --git a/app/Http/Controllers/Contacts/DebtController.php b/app/Http/Controllers/Contacts/DebtController.php
@@ -48,6 +48,8 @@ public function create(Contact $contact)
      */
     public function store(DebtRequest $request, Contact $contact)
     {
+        $contact->throwInactive();
+
         $contact->debts()->create(
             $request->only([
                 'in_debt',
@@ -87,6 +89,8 @@ public function show(Contact $contact, Debt $debt): void
      */
     public function edit(Contact $contact, Debt $debt)
     {
+        $contact->throwInactive();
+
         return view('people.debt.edit')
             ->withContact($contact)
             ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account))
@@ -104,6 +108,8 @@ public function edit(Contact $contact, Debt $debt)
      */
     public function update(DebtRequest $request, Contact $contact, Debt $debt)
     {
+        $contact->throwInactive();
+
         $debt->update(
             $request->only([
                 'in_debt',
@@ -130,6 +136,8 @@ public function update(DebtRequest $request, Contact $contact, Debt $debt)
      */
     public function destroy(Contact $contact, Debt $debt)
     {
+        $contact->throwInactive();
+
         $debt->delete();
 
         return redirect()->route('people.show', $contact)

diff --git a/app/Http/Controllers/Contacts/DocumentsController.php b/app/Http/Controllers/Contacts/DocumentsController.php
@@ -50,6 +50,8 @@ public function index(Request $request, Contact $contact)
      */
     public function store(Request $request, Contact $contact): Document
     {
+        $contact->throwInactive();
+
         return app(UploadDocument::class)->execute([
             'account_id' => auth()->user()->account_id,
             'contact_id' => $contact->id,

diff --git a/app/Http/Controllers/Contacts/IntroductionsController.php b/app/Http/Controllers/Contacts/IntroductionsController.php
@@ -21,6 +21,8 @@ class IntroductionsController extends Controller
      */
     public function edit(Contact $contact)
     {
+        $contact->throwInactive();
+
         $contacts = $contact->siblingContacts()
                         ->real()
                         ->active()
@@ -41,6 +43,8 @@ public function edit(Contact $contact)
      */
     public function update(Request $request, Contact $contact)
     {
+        $contact->throwInactive();
+
         $contact = app(UpdateContactIntroduction::class)->execute([
             'account_id' => auth()->user()->account_id,
             'contact_id' => $contact->id,

diff --git a/app/Http/Controllers/Contacts/NotesController.php b/app/Http/Controllers/Contacts/NotesController.php
@@ -41,6 +41,8 @@ public function index(Contact $contact)
      */
     public function store(NotesRequest $request, Contact $contact)
     {
+        $contact->throwInactive();
+
         return $contact->notes()->create([
             'account_id' => auth()->user()->account_id,
             'body' => $request->input('body'),
@@ -72,6 +74,8 @@ public function toggle(NoteToggleRequest $request, Contact $contact, Note $note)
      */
     public function update(NotesRequest $request, Contact $contact, Note $note): Note
     {
+        $contact->throwInactive();
+
         $note->update(
             $request->only([
                 'body',
@@ -92,6 +96,8 @@ public function update(NotesRequest $request, Contact $contact, Note $note): Not
      */
     public function destroy(Contact $contact, Note $note): void
     {
+        $contact->throwInactive();
+
         $note->delete();
     }
 }
diff --git a/app/Http/Controllers/Contacts/PetsController.php b/app/Http/Controllers/Contacts/PetsController.php
@@ -59,6 +59,8 @@ public function index(Contact $contact)
      */
     public function store(PetsRequest $request, Contact $contact)
     {
+        $contact->throwInactive();
+
         $pet = $contact->pets()->create(
             $request->only([
                 'pet_category_id',
@@ -83,6 +85,8 @@ public function store(PetsRequest $request, Contact $contact)
      */
     public function update(PetsRequest $request, Contact $contact, Pet $pet)
     {
+        $contact->throwInactive();
+
         $pet->update(
             $request->only([
                 'pet_category_id',

diff --git a/app/Http/Controllers/Contacts/RelationshipsController.php b/app/Http/Controllers/Contacts/RelationshipsController.php
@@ -99,6 +99,8 @@ public function store(Request $request, Contact $contact)
      */
     public function edit(Contact $contact, Relationship $relationship)
     {
+        $contact->throwInactive();
+
         $otherContact = $relationship->ofContact;
 
         $now = now();

diff --git a/app/Http/Controllers/Contacts/TagsController.php b/app/Http/Controllers/Contacts/TagsController.php
@@ -49,6 +49,8 @@ public function get(Request $request, Contact $contact)
      */
     public function update(Request $request, Contact $contact): void
     {
+        $contact->throwInactive();
+
         $tags = $request->all();
 
         // detaching all the tags

diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
@@ -335,9 +335,7 @@ public function show(Contact $contact)
      */
     public function edit(Contact $contact)
     {
-        if (! $contact->is_active) {
-            return back()->withErrors(trans('people.archived_contact_readonly'));
-        }
+        $contact->throwInactive();
 
         $now = now();
         $age = (string) (! is_null($contact->birthdate) ? $contact->birthdate->getAge() : 0);
@@ -378,9 +376,7 @@ public function edit(Contact $contact)
      */
     public function update(Request $request, Contact $contact)
     {
-        if (! $contact->is_active) {
-            return back()->withErrors(trans('people.archived_contact_readonly'));
-        }
+        $contact->throwInactive();
 
         // process birthday dates
         // TODO: remove this part entirely when we redo this whole SpecialDate
@@ -499,9 +495,7 @@ public function destroy(Request $request, Contact $contact)
      */
     public function editWork(Request $request, Contact $contact)
     {
-        if (! $contact->is_active) {
-            return back()->withErrors(trans('people.archived_contact_readonly'));
-        }
+        $contact->throwInactive();
 
         return view('people.work.edit')
             ->withContact($contact);
@@ -517,9 +511,7 @@ public function editWork(Request $request, Contact $contact)
      */
     public function updateWork(Request $request, Contact $contact)
     {
-        if (! $contact->is_active) {
-            return back()->withErrors(trans('people.archived_contact_readonly'));
-        }
+        $contact->throwInactive();
 
         $contact = app(UpdateWorkInformation::class)->execute([
             'account_id' => auth()->user()->account_id,
@@ -543,9 +535,7 @@ public function updateWork(Request $request, Contact $contact)
      */
     public function editFoodPreferences(Request $request, Contact $contact)
     {
-        if (! $contact->is_active) {
-            return back()->withErrors(trans('people.archived_contact_readonly'));
-        }
+        $contact->throwInactive();
 
         $accountHasLimitations = AccountHelper::hasLimitations(auth()->user()->account);
 
@@ -564,9 +554,7 @@ public function editFoodPreferences(Request $request, Contact $contact)
      */
     public function updateFoodPreferences(Request $request, Contact $contact)
     {
-        if (! $contact->is_active) {
-            return back()->withErrors(trans('people.archived_contact_readonly'));
-        }
+        $contact->throwInactive();
 
         $contact = app(UpdateContactFoodPreferences::class)->execute([
             'account_id' => auth()->user()->account_id,
@@ -631,9 +619,7 @@ public function vCard(Contact $contact)
      */
     public function stayInTouch(Request $request, Contact $contact)
     {
-        if (! $contact->is_active) {
-            return back()->withErrors(trans('people.archived_contact_readonly'));
-        }
+        $contact->throwInactive();
 
         $frequency = intval($request->input('frequency'));
         $state = $request->input('state');

diff --git a/app/Jobs/Avatars/UpdateAllGravatars.php b/app/Jobs/Avatars/UpdateAllGravatars.php
@@ -21,6 +21,7 @@ public function handle()
     {
         $contacts = Contact::where('avatar_source', 'gravatar')
             ->orWhere('avatar_gravatar_url', '<>', '')
+            ->active()
             ->get();
 
         foreach ($contacts as $contact) {

diff --git a/app/Models/Contact/Contact.php b/app/Models/Contact/Contact.php
@@ -26,6 +26,7 @@
 use App\Models\Relationship\Relationship;
 use Illuminate\Database\Eloquent\Builder;
 use App\Models\ModelBindingHasher as Model;
+use Illuminate\Validation\ValidationException;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -1503,4 +1504,13 @@ public function updateConsulted()
 
         $this->timestamps = $timestamps;
     }
+
+    public function throwInactive()
+    {
+        if (! $this->is_active) {
+            throw ValidationException::withMessages([
+                trans('people.archived_contact_readonly'),
+            ]);
+        }
+    }
 }
diff --git a/app/Services/Account/Photo/UploadPhoto.php b/app/Services/Account/Photo/UploadPhoto.php
@@ -54,6 +54,8 @@ public function execute(array $data): ?Photo
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         $array = null;
         if (Arr::has($data, 'photo')) {
             $array = $this->importPhoto($data);

diff --git a/app/Services/Contact/Address/CreateAddress.php b/app/Services/Contact/Address/CreateAddress.php
@@ -43,9 +43,11 @@ public function execute(array $data): Address
     {
         $this->validate($data);
 
-        Contact::where('account_id', $data['account_id'])
+        $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         $place = $this->createPlace($data);
 
         $address = Address::create([

diff --git a/app/Services/Contact/Address/DestroyAddress.php b/app/Services/Contact/Address/DestroyAddress.php
@@ -34,6 +34,8 @@ public function execute(array $data): bool
         $address = Address::where('account_id', $data['account_id'])
             ->findOrFail($data['address_id']);
 
+        $address->contact->throwInactive();
+
         app(DestroyPlace::class)->execute([
             'account_id' => $data['account_id'],
             'place_id' => $address->place_id,

diff --git a/app/Services/Contact/Address/UpdateAddress.php b/app/Services/Contact/Address/UpdateAddress.php
@@ -49,9 +49,11 @@ public function execute(array $data): Address
             ->where('contact_id', $data['contact_id'])
             ->findOrFail($data['address_id']);
 
-        Contact::where('account_id', $data['account_id'])
+        $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         $this->updatePlace($data, $address);
 
         $address->update([

diff --git a/app/Services/Contact/Avatar/UpdateAvatar.php b/app/Services/Contact/Avatar/UpdateAvatar.php
@@ -49,6 +49,8 @@ public function execute(array $data): Contact
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         if (isset($data['photo_id'])) {
             Photo::where('account_id', $data['account_id'])
                 ->findOrFail($data['photo_id']);

diff --git a/app/Services/Contact/Call/CreateCall.php b/app/Services/Contact/Call/CreateCall.php
@@ -40,6 +40,8 @@ public function execute(array $data): Call
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         // emotions array is left out as they are not attached during this call
         $call = Call::create(Arr::except($data, ['emotions']));
 

diff --git a/app/Services/Contact/Call/DestroyCall.php b/app/Services/Contact/Call/DestroyCall.php
@@ -36,6 +36,8 @@ public function execute(array $data): bool
 
         $contact = $call->contact;
 
+        $contact->throwInactive();
+
         // delete all associations with emotions
         $call->emotions()->sync([]);
 

diff --git a/app/Services/Contact/Call/UpdateCall.php b/app/Services/Contact/Call/UpdateCall.php
@@ -39,6 +39,8 @@ public function execute(array $data): Call
         $call = Call::where('account_id', $data['account_id'])
             ->findOrFail($data['call_id']);
 
+        $call->contact->throwInactive();
+
         $call->update([
             'called_at' => $data['called_at'],
             'content' => (empty($data['content']) ? null : $data['content']),

diff --git a/app/Services/Contact/Contact/DestroyContact.php b/app/Services/Contact/Contact/DestroyContact.php
@@ -35,6 +35,8 @@ public function execute(array $data): bool
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         $this->destroyRelationships($data, $contact);
 
         $contact->deleteAvatars();

diff --git a/app/Services/Contact/Contact/UpdateBirthdayInformation.php b/app/Services/Contact/Contact/UpdateBirthdayInformation.php
@@ -72,6 +72,8 @@ public function execute(array $data)
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         $this->clearRelatedReminder($contact);
 
         $this->clearRelatedSpecialDate($contact);

diff --git a/app/Services/Contact/Contact/UpdateContact.php b/app/Services/Contact/Contact/UpdateContact.php
@@ -65,6 +65,8 @@ public function execute(array $data): Contact
         $this->contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $this->contact->throwInactive();
+
         // Test is the account is limited and the contact should be updated as real contact
         $account = Account::find($data['account_id']);
         if ($this->contact->is_partial

diff --git a/app/Services/Contact/Contact/UpdateContactFoodPreferences.php b/app/Services/Contact/Contact/UpdateContactFoodPreferences.php
@@ -36,6 +36,7 @@ public function execute(array $data): Contact
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
         if ($contact->is_partial) {
             throw ValidationException::withMessages([
                 'contact_id' => 'The contact can\'t be a partial contact',

diff --git a/app/Services/Contact/Contact/UpdateContactIntroduction.php b/app/Services/Contact/Contact/UpdateContactIntroduction.php
@@ -77,6 +77,8 @@ public function execute(array $data): Contact
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         if ($contact->is_partial) {
             throw ValidationException::withMessages([
                 'contact_id' => 'The contact can\'t be a partial contact',

diff --git a/app/Services/Contact/Contact/UpdateDeceasedInformation.php b/app/Services/Contact/Contact/UpdateDeceasedInformation.php
@@ -44,6 +44,8 @@ public function execute(array $data)
         $contact = Contact::where('account_id', $data['account_id'])
             ->findOrFail($data['contact_id']);
 
+        $contact->throwInactive();
+
         $this->clearRelatedReminder($contact);
 
         $this->clearRelatedSpecialDate($contact);