amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fix contacts account mismatch (#1625)

Browse Source
This commit is contained in:
Alexis Saettler
2018-08-01 23:28:05 +02:00
committed by GitHub
parent cd4ce7e547
commit 1c70d4ef24
46 changed files with 231 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/ApiActivityController.php
+18 -21
View File
@@ -45,8 +45,7 @@ class ApiActivityController extends ApiController
{
try {
$activity = Activity::where('account_id', auth()->user()->account_id)
->where('id', $activityId)
->firstOrFail();
->findOrFail($activityId);
} catch (ModelNotFoundException $e) {
return $this->respondNotFound();
}
@@ -61,9 +60,9 @@ class ApiActivityController extends ApiController
*/
public function store(Request $request)
{
$contact = $this->validateUpdate($request);
if (! $contact instanceof Contact) {
return $contact;
$isvalid = $this->validateUpdate($request);
if ($isvalid !== true) {
return $isvalid;
}
try {
@@ -74,7 +73,7 @@ class ApiActivityController extends ApiController
'activity_type_id',
'description',
])
+ ['account_id' => auth()->user()->account->id]
+ ['account_id' => auth()->user()->account_id]
);
} catch (QueryException $e) {
return $this->respondNotTheRightParameters();
@@ -86,7 +85,8 @@ class ApiActivityController extends ApiController
// Now we associate the activity with each one of the attendees
$attendeesID = $request->get('contacts');
foreach ($attendeesID as $attendeeID) {
$contact = Contact::findOrFail($attendeeID);
$contact = Contact::where('account_id', auth()->user()->account_id)
->findOrFail($attendeeID);
$contact->activities()->save($activity);
$contact->logEvent('activity', $activity->id, 'create');
$contact->calculateActivitiesStatistics();
@@ -105,8 +105,7 @@ class ApiActivityController extends ApiController
{
try {
$activity = Activity::where('account_id', auth()->user()->account_id)
->where('id', $activityId)
->firstOrFail();
->findOrFail($activityId);
} catch (ModelNotFoundException $e) {
return $this->respondNotFound();
}
@@ -135,14 +134,14 @@ class ApiActivityController extends ApiController
(new JournalEntry)->add($activity);
// Get the attendees
$attendees = $request->get('contacts');
$attendeesID = $request->get('contacts');
// Find existing contacts
$existing = $activity->contacts()->get();
foreach ($existing as $contact) {
// Has an existing attendee been removed?
if (! in_array($contact->id, $attendees)) {
if (! in_array($contact->id, $attendeesID)) {
$contact->activities()->detach($activity);
$contact->logEvent('activity', $activity->id, 'delete');
} else {
@@ -153,15 +152,16 @@ class ApiActivityController extends ApiController
// Remove this ID from our list of contacts as we don't
// want to add them to the activity again
$idx = array_search($contact->id, $attendees);
unset($attendees[$idx]);
$idx = array_search($contact->id, $attendeesID);
unset($attendeesID[$idx]);
$contact->calculateActivitiesStatistics();
}
// New attendees
foreach ($attendees as $newContactId) {
$contact = Contact::findOrFail($newContactId);
foreach ($attendeesID as $attendeeID) {
$contact = Contact::where('account_id', auth()->user()->account_id)
->findOrFail($attendeeID);
$contact->activities()->save($activity);
$contact->logEvent('activity', $activity->id, 'create');
}
@@ -197,8 +197,7 @@ class ApiActivityController extends ApiController
foreach ($attendeesID as $attendeeID) {
try {
Contact::where('account_id', auth()->user()->account_id)
->where('id', $attendeeID)
->firstOrFail();
->findOrFail($attendeeID);
} catch (ModelNotFoundException $e) {
return $this->respondNotFound();
}
@@ -216,8 +215,7 @@ class ApiActivityController extends ApiController
{
try {
$activity = Note::where('account_id', auth()->user()->account_id)
->where('id', $activityId)
->firstOrFail();
->findOrFail($activityId);
} catch (ModelNotFoundException $e) {
return $this->respondNotFound();
}
@@ -238,8 +236,7 @@ class ApiActivityController extends ApiController
{
try {
$contact = Contact::where('account_id', auth()->user()->account_id)
->where('id', $contactId)
->firstOrFail();
->findOrFail($contactId);
} catch (ModelNotFoundException $e) {
return $this->respondNotFound();
}