Add the ability to set an external avatar (#662)

This will allow the new Chrome extension for Monica to fetch contacts from Facebook and retrieve the avatar.
monicahq · Nov 28, 2017 · 84a1461 · 84a1461
1 parent 259be09
commit 84a1461
Show file tree

Hide file tree

Showing 34 changed files with 263 additions and 168 deletions.
diff --git a/app/Contact.php b/app/Contact.php
@@ -70,6 +70,7 @@ class Contact extends Model
         'linkedin_profile_url',
         'is_dead',
         'deceased_date',
+        'avatar_external_url',
     ];
 
     /**
@@ -94,6 +95,7 @@ class Contact extends Model
     protected $casts = [
         'is_partial' => 'boolean',
         'is_dead' => 'boolean',
+        'has_avatar' => 'boolean',
     ];
 
     /**
@@ -726,8 +728,17 @@ public function getCompletedTasks()
      * @param  int $size
      * @return string
      */
-    public function getAvatarURL($size)
+    public function getAvatarURL($size = 100)
     {
+        // it either returns null or the gravatar url if it's defined
+        if (! $this->has_avatar) {
+            return $this->gravatar_url;
+        }
+
+        if ($this->avatar_location == 'external') {
+            return $this->avatar_external_url;
+        }
+
         $original_avatar_url = Storage::disk($this->avatar_location)->url($this->avatar_file_name);
         $avatar_filename = pathinfo($original_avatar_url, PATHINFO_FILENAME);
         $avatar_extension = pathinfo($original_avatar_url, PATHINFO_EXTENSION);
@@ -736,6 +747,22 @@ public function getAvatarURL($size)
         return Storage::disk($this->avatar_location)->url($resized_avatar);
     }
 
+    /**
+     * Returns the source of the avatar, or null if avatar is undefined.
+     */
+    public function getAvatarSource()
+    {
+        if (! $this->has_avatar) {
+            return;
+        }
+
+        if ($this->avatar_location == 'external') {
+            return 'external';
+        }
+
+        return 'internal';
+    }
+
     /**
      * Get the gravatar, if it exits.
      *

diff --git a/app/Http/Controllers/Api/ApiContactController.php b/app/Http/Controllers/Api/ApiContactController.php
@@ -66,39 +66,24 @@ public function store(Request $request)
                 Rule::in(['exact', 'approximate', 'unknown']),
             ],
             'age' => 'nullable|integer',
-            'email' => 'nullable|email|max:255',
-            'phone_number' => 'nullable|max:255',
             'job' => 'nullable|max:255',
             'company' => 'nullable|max:255',
             'food_preferencies' => 'nullable|max:100000',
-            'facebook_profile_url' => 'nullable|max:255',
-            'twitter_profile_url' => 'nullable|max:255',
             'linkedin_profile_url' => 'nullable|max:255',
             'first_met_information' => 'nullable|max:1000000',
             'first_met_date' => 'nullable|date',
             'first_met_through_contact_id' => 'nullable|integer',
             'is_partial' => 'required|integer',
             'is_dead' => 'required|integer',
             'deceased_date' => 'nullable|date',
+            'avatar_url' => 'nullable|max:400',
         ]);
 
         if ($validator->fails()) {
             return $this->setErrorCode(32)
                         ->respondWithError($validator->errors()->all());
         }
 
-        // Make sure the email is unique
-        if ($request->input('email') != '') {
-            $otherContact = Contact::where('email', $request->input('email'))
-                                    ->count();
-
-            if ($otherContact > 0) {
-                return $this->setErrorCode(35)
-                        ->setHTTPStatusCode(500)
-                        ->respondWithError(trans('people.people_edit_email_error'));
-            }
-        }
-
         // Make sure the `first_met_through_contact_id` is a contact id that the
         // user is authorized to access
         if ($request->get('first_met_through_contact_id')) {
@@ -113,11 +98,36 @@ public function store(Request $request)
 
         // Create the contact
         try {
-            $contact = Contact::create($request->all());
+            $contact = Contact::create(
+                $request->only([
+                    'first_name',
+                    'last_name',
+                    'gender',
+                    'birthdate',
+                    'is_birthdate_approximate',
+                    'age',
+                    'job',
+                    'company',
+                    'food_preferencies',
+                    'linkedin_profile_url',
+                    'first_met_information',
+                    'first_met_date',
+                    'first_met_through_contact_id',
+                    'is_partial',
+                    'is_dead',
+                    'deceased_date',
+                ]) + [
+                'avatar_external_url' => $request->get('avatar_url'),
+            ]);
         } catch (QueryException $e) {
             return $this->respondNotTheRightParameters();
         }
 
+        if ($request->get('avatar_url')) {
+            $contact->has_avatar = true;
+            $contact->avatar_location = 'external';
+        }
+
         // Saving first met information (these are not the same field names than
         // the ones provided in the JSON)
         if ($request->get('first_met_date')) {
@@ -170,13 +180,9 @@ public function update(Request $request, $contactId)
                 Rule::in(['exact', 'approximate', 'unknown']),
             ],
             'age' => 'nullable|integer',
-            'email' => 'nullable|email|max:255',
-            'phone_number' => 'nullable|max:255',
             'job' => 'nullable|max:255',
             'company' => 'nullable|max:255',
             'food_preferencies' => 'nullable|max:100000',
-            'facebook_profile_url' => 'nullable|max:255',
-            'twitter_profile_url' => 'nullable|max:255',
             'linkedin_profile_url' => 'nullable|max:255',
             'first_met_information' => 'nullable|max:1000000',
             'first_met_date' => 'nullable|date',
@@ -191,19 +197,6 @@ public function update(Request $request, $contactId)
                         ->respondWithError($validator->errors()->all());
         }
 
-        // Make sure the email is unique
-        if ($request->input('email') != '') {
-            $otherContact = Contact::where('email', $request->input('email'))
-                                    ->where('id', '!=', $contactId)
-                                    ->count();
-
-            if ($otherContact > 0) {
-                return $this->setErrorCode(35)
-                        ->setHTTPStatusCode(500)
-                        ->respondWithError(trans('people.people_edit_email_error'));
-            }
-        }
-
         // Make sure the `first_met_through_contact_id` is a contact id that the
         // user is authorized to access
         if ($request->get('first_met_through_contact_id')) {

diff --git a/...ontrollers/People/AddressesController.php → ...trollers/Contacts/AddressesController.php b/...ontrollers/People/AddressesController.php → ...trollers/Contacts/AddressesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use Auth;
 use App\Address;

diff --git a/...tp/Controllers/People/CallsController.php → .../Controllers/Contacts/CallsController.php b/...tp/Controllers/People/CallsController.php → .../Controllers/Contacts/CallsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Call;
 use App\Contact;

diff --git a/...ollers/People/ContactFieldsController.php → ...lers/Contacts/ContactFieldsController.php b/...ollers/People/ContactFieldsController.php → ...lers/Contacts/ContactFieldsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use Auth;
 use App\Contact;

diff --git a/...ttp/Controllers/People/DebtController.php → ...p/Controllers/Contacts/DebtController.php b/...ttp/Controllers/People/DebtController.php → ...p/Controllers/Contacts/DebtController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Debt;
 use App\Contact;

diff --git a/...tp/Controllers/People/GiftsController.php → .../Controllers/Contacts/GiftsController.php b/...tp/Controllers/People/GiftsController.php → .../Controllers/Contacts/GiftsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Gift;
 use App\Contact;

diff --git a/...ollers/People/IntroductionsController.php → ...lers/Contacts/IntroductionsController.php b/...ollers/People/IntroductionsController.php → ...lers/Contacts/IntroductionsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Contact;
 use App\Http\Controllers\Controller;

diff --git a/...ttp/Controllers/People/KidsController.php → ...p/Controllers/Contacts/KidsController.php b/...ttp/Controllers/People/KidsController.php → ...p/Controllers/Contacts/KidsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Contact;
 use App\Http\Controllers\Controller;

diff --git a/...tp/Controllers/People/NotesController.php → .../Controllers/Contacts/NotesController.php b/...tp/Controllers/People/NotesController.php → .../Controllers/Contacts/NotesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Note;
 use App\Contact;

diff --git a/...ollers/People/RelationshipsController.php → ...lers/Contacts/RelationshipsController.php b/...ollers/People/RelationshipsController.php → ...lers/Contacts/RelationshipsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Contact;
 use App\Relationship;

diff --git a/...ontrollers/People/RemindersController.php → ...trollers/Contacts/RemindersController.php b/...ontrollers/People/RemindersController.php → ...trollers/Contacts/RemindersController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Contact;
 use App\Reminder;

diff --git a/...ttp/Controllers/People/TagsController.php → ...p/Controllers/Contacts/TagsController.php b/...ttp/Controllers/People/TagsController.php → ...p/Controllers/Contacts/TagsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Contact;
 use App\Http\Controllers\Controller;

diff --git a/...tp/Controllers/People/TasksController.php → .../Controllers/Contacts/TasksController.php b/...tp/Controllers/People/TasksController.php → .../Controllers/Contacts/TasksController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\People;
+namespace App\Http\Controllers\Contacts;
 
 use App\Task;
 use App\Contact;

diff --git a/app/Http/Controllers/PeopleController.php → app/Http/Controllers/ContactsController.php b/app/Http/Controllers/PeopleController.php → app/Http/Controllers/ContactsController.php
@@ -13,7 +13,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
-class PeopleController extends Controller
+class ContactsController extends Controller
 {
     /**
      * Display a listing of the resource.
@@ -165,23 +165,12 @@ public function update(Request $request, Contact $contact)
                 ->withErrors($validator);
         }
 
-        // Make sure the email address is unique in this account
-        if ($request->input('email') != '') {
-            $otherContact = Contact::where('email', $request->input('email'))
-                                    ->where('id', '!=', $contact->id)
-                                    ->count();
-
-            if ($otherContact > 0) {
-                return redirect()->back()->withErrors(trans('people.people_edit_email_error'))->withInput();
-            }
-        }
-
         $contact->gender = $request->input('gender');
         $contact->first_name = $request->input('firstname');
         $contact->last_name = $request->input('lastname');
 
         if ($request->file('avatar') != '') {
-            $contact->has_avatar = 'true';
+            $contact->has_avatar = true;
             $contact->avatar_location = config('filesystems.default');
             $contact->avatar_file_name = $request->avatar->store('avatars', config('filesystems.default'));
         }

diff --git a/app/Http/Resources/Contact/Contact.php b/app/Http/Resources/Contact/Contact.php
@@ -52,35 +52,17 @@ public function toArray($request)
                     'job' => $this->job,
                     'company' => $this->company,
                 ]),
-                'avatar' => [
-                    'gravatar_url' => $this->getGravatar(110),
-                ],
+                'avatar' => $this->when(! $this->is_partial, [
+                    'url' => $this->getAvatarUrl(),
+                    'source' => $this->getAvatarSource(),
+                ]),
                 'food_preferencies' => $this->when(! $this->is_partial, $this->food_preferencies),
-                'how_you_met' => [
+                'how_you_met' => $this->when(! $this->is_partial, [
                     'general_information' => $this->first_met_additional_info,
                     'first_met_date' => (is_null($this->first_met) ? null : $this->first_met->format(config('api.timestamp_format'))),
                     'first_met_through_contact' => new ContactShortResource($this->getIntroducer()),
-                ],
+                ]),
             ],
-            'contact' => $this->when(! $this->is_partial, [
-                'emails' => [
-                    [
-                        'name' => 'personal',
-                        'email' => $this->email,
-                    ],
-                ],
-                'phone_numbers' => [
-                    [
-                        'name' => 'home',
-                        'phone_number' => $this->phone_number,
-                    ],
-                ],
-                'social_network' => [
-                    'facebook_profile_url' => $this->facebook_profile_url,
-                    'twitter_profile_url' => $this->twitter_profile_url,
-                    'linkedin_profile_url' => $this->linkedin_profile_url,
-                ],
-            ]),
             'addresses' => $this->when(! $this->is_partial, $this->getAddressesForAPI()),
             'tags' => $this->when(! $this->is_partial, $this->getTagsForAPI()),
             'statistics' => $this->when(! $this->is_partial, [

diff --git a/app/Jobs/ResizeAvatars.php b/app/Jobs/ResizeAvatars.php
@@ -34,7 +34,7 @@ public function __construct(Contact $contact)
      */
     public function handle()
     {
-        if ($this->contact->has_avatar == 'true') {
+        if ($this->contact->has_avatar == true) {
             try {
                 $avatar_file = Storage::disk($this->contact->avatar_location)->get($this->contact->avatar_file_name);
                 $avatar_path = Storage::disk($this->contact->avatar_location)->url($this->contact->avatar_file_name);

diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -63,6 +63,7 @@
         'first_name' => 'John',
         'last_name' => 'Doe',
         'birthdate' => \Carbon\Carbon::createFromTimeStamp($faker->dateTimeThisCentury()->getTimeStamp()),
+        'has_avatar' => false,
     ];
 });