Skip to content

Commit

Permalink
- [X] Reformat code
Browse files Browse the repository at this point in the history
  • Loading branch information
aemaddin committed Mar 10, 2024
1 parent 40d359f commit 555aeae
Show file tree
Hide file tree
Showing 9 changed files with 97 additions and 81 deletions.
6 changes: 3 additions & 3 deletions src/Concerns/ManagesBulkActions.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Asciisd\Zoho\Concerns;

use com\zoho\crm\api\record\BodyWrapper;
use com\zoho\crm\api\record\ActionWrapper;
use com\zoho\crm\api\modules\APIException;
use com\zoho\crm\api\record\ActionWrapper;
use com\zoho\crm\api\record\BodyWrapper;
use com\zoho\crm\api\record\RecordOperations;

trait ManagesBulkActions
Expand Down Expand Up @@ -32,7 +32,7 @@ private function handleBulkActionResponse($response): ActionWrapper|array
if ($responseHandler instanceof ActionWrapper) {
return $responseHandler->getData();
} elseif ($responseHandler instanceof APIException) {
logger()->error($responseHandler->getMessage()->getValue());
logger()->error($responseHandler->getMessage());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Concerns/ManagesModules.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private function handleModuleResponse($response): array
if ($responseHandler instanceof ModulesResponseWrapper) {
return $responseHandler->getModules();
} elseif ($responseHandler instanceof APIException) {
logger()->error($responseHandler->getMessage()->getValue());
logger()->error($responseHandler->getMessage());
}
}

Expand Down
42 changes: 31 additions & 11 deletions src/Concerns/ManagesRecords.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace Asciisd\Zoho\Concerns;

use com\zoho\crm\api\ParameterMap;
use com\zoho\crm\api\record\Record;
use com\zoho\crm\api\modules\APIException;
use com\zoho\crm\api\ParameterMap;
use com\zoho\crm\api\record\GetRecordsParam;
use com\zoho\crm\api\record\Record;
use com\zoho\crm\api\record\RecordOperations;
use com\zoho\crm\api\record\SearchRecordsParam;
use com\zoho\crm\api\record\ResponseWrapper as RecordResponseWrapper;
use com\zoho\crm\api\record\SearchRecordsParam;

trait ManagesRecords
{
Expand Down Expand Up @@ -37,8 +37,13 @@ public function getRecords($page = 1, $perPage = 200, $sortBy = 'id', $sortOrder
);
}

public function searchRecordsByCriteria(string $criteria, $page = 1, $perPage = 200, $sortBy = 'id', $sortOrder = 'desc'): array
{
public function searchRecordsByCriteria(
string $criteria,
$page = 1,
$perPage = 200,
$sortBy = 'id',
$sortOrder = 'desc'
): array {
$recordOperations = new RecordOperations($this->module_api_name);
$paramInstance = new ParameterMap();

Expand All @@ -53,8 +58,13 @@ public function searchRecordsByCriteria(string $criteria, $page = 1, $perPage =
);
}

public function searchRecordsByWord(string $word, $page = 1, $perPage = 200, $sortBy = 'id', $sortOrder = 'desc'): array
{
public function searchRecordsByWord(
string $word,
$page = 1,
$perPage = 200,
$sortBy = 'id',
$sortOrder = 'desc'
): array {
$recordOperations = new RecordOperations($this->module_api_name);
$paramInstance = new ParameterMap();

Expand All @@ -69,8 +79,13 @@ public function searchRecordsByWord(string $word, $page = 1, $perPage = 200, $so
);
}

public function searchRecordsByPhone(string $phone, $page = 1, $perPage = 200, $sortBy = 'id', $sortOrder = 'desc'): array
{
public function searchRecordsByPhone(
string $phone,
$page = 1,
$perPage = 200,
$sortBy = 'id',
$sortOrder = 'desc'
): array {
$recordOperations = new RecordOperations($this->module_api_name);
$paramInstance = new ParameterMap();

Expand All @@ -85,8 +100,13 @@ public function searchRecordsByPhone(string $phone, $page = 1, $perPage = 200, $
);
}

public function searchRecordsByEmail(string $email, $page = 1, $perPage = 200, $sortBy = 'id', $sortOrder = 'desc'): array
{
public function searchRecordsByEmail(
string $email,
$page = 1,
$perPage = 200,
$sortBy = 'id',
$sortOrder = 'desc'
): array {
$recordOperations = new RecordOperations($this->module_api_name);
$paramInstance = new ParameterMap();

Expand Down
84 changes: 40 additions & 44 deletions src/Concerns/ManagesTags.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@

namespace Asciisd\Zoho\Concerns;

use com\zoho\crm\api\tags\AddTagsParam;
use com\zoho\crm\api\tags\Tag;
use com\zoho\crm\api\exception\SDKException;
use com\zoho\crm\api\modules\APIException;
use com\zoho\crm\api\ParameterMap;
use com\zoho\crm\api\tags\GetTagsParam;
use com\zoho\crm\api\tags\AddTagsParam;
use com\zoho\crm\api\tags\AddTagsToMultipleRecordsParam;
use com\zoho\crm\api\tags\BodyWrapper;
use com\zoho\crm\api\tags\MergeWrapper;
use com\zoho\crm\api\tags\TagsOperations;
use com\zoho\crm\api\tags\UpdateTagParam;
use com\zoho\crm\api\tags\UpdateTagsParam;
use com\zoho\crm\api\modules\APIException;
use com\zoho\crm\api\tags\ConflictWrapper;
use com\zoho\crm\api\tags\CreateTagsParam;
use com\zoho\crm\api\exception\SDKException;
use com\zoho\crm\api\tags\GetRecordCountForTagParam;
use com\zoho\crm\api\tags\AddTagsToMultipleRecordsParam;
use com\zoho\crm\api\tags\GetTagsParam;
use com\zoho\crm\api\tags\MergeWrapper;
use com\zoho\crm\api\tags\RemoveTagsFromMultipleRecordsParam;
use com\zoho\crm\api\tags\ResponseWrapper as TagResponseWrapper;
use com\zoho\crm\api\tags\Tag;
use com\zoho\crm\api\tags\TagsOperations;
use com\zoho\crm\api\tags\UpdateTagParam;
use com\zoho\crm\api\tags\UpdateTagsParam;


trait ManagesTags {
trait ManagesTags
{

/**
* The method to get tags
Expand All @@ -31,7 +32,7 @@ trait ManagesTags {
public function getTags(): array
{
$tagsOperations = new TagsOperations();
$paramInstance = new ParameterMap();
$paramInstance = new ParameterMap();
$paramInstance->add(GetTagsParam::module(), $this->module_api_name);

return $this->handleTagResponse(
Expand All @@ -41,7 +42,7 @@ public function getTags(): array
}

/**
* @param array $tagNames
* @param array $tagNames
* @return array
* @throws SDKException
*/
Expand Down Expand Up @@ -77,7 +78,7 @@ public function createTags(array $tagNames): array


/**
* @param array $tags
* @param array $tags
* @return array
* @throws SDKException
*/
Expand Down Expand Up @@ -117,7 +118,7 @@ public function updateTags(array $tags): array
}

/**
* @param array $tag
* @param array $tag
* @return array
* @throws SDKException
*/
Expand Down Expand Up @@ -154,7 +155,7 @@ public function updateTag(array $tag): array
}

/**
* @param string $id
* @param string $id
* @return array
*/
public function deleteTag(string $id): array
Expand All @@ -170,8 +171,8 @@ public function deleteTag(string $id): array
}

/**
* @param string $id
* @param string $conflictId
* @param string $id
* @param string $conflictId
* @return array
*/
public function mergeTags(string $id, string $conflictId): array
Expand Down Expand Up @@ -202,8 +203,8 @@ public function mergeTags(string $id, string $conflictId): array
}

/**
* @param string $recordId
* @param array $tagNames
* @param string $recordId
* @param array $tagNames
* @return array
* @throws SDKException
*/
Expand Down Expand Up @@ -233,8 +234,8 @@ public function addTagsToRecord(string $recordId, array $tagNames): array
}

/**
* @param string $recordId
* @param array $tagNames
* @param string $recordId
* @param array $tagNames
* @return array
* @throws SDKException
*/
Expand All @@ -247,54 +248,51 @@ public function removeTagsFromRecord(string $recordId, array $tagNames): array
//Get instance of ParameterMap Class
$paramInstance = new ParameterMap();

foreach($tagNames as $tagName)
{
foreach ($tagNames as $tagName) {
$paramInstance->add(RemoveTagsFromMultipleRecordsParam::ids(), $tagName);
}

//Call removeTagsFromRecord method that takes paramInstance, moduleAPIName and recordId as parameter
return $this->handleTagResponse(
$tagsOperations->removeTagsFromMultipleRecords(
$recordId,
$this->module_api_name,
$paramInstance)
$tagsOperations->removeTagsFromMultipleRecords(
$recordId,
$this->module_api_name,
$paramInstance)
);
}

/**
* @param array $recordIds
* @param array $tagNames
* @param array $recordIds
* @param array $tagNames
* @return array
* @throws SDKException
*/
public function addTagsToMultipleRecords( array $recordIds, array $tagNames): array
public function addTagsToMultipleRecords(array $recordIds, array $tagNames): array
{
//Get instance of TagsOperations Class
$tagsOperations = new TagsOperations();

//Get instance of ParameterMap Class
$paramInstance = new ParameterMap();

foreach($tagNames as $tagName)
{
foreach ($tagNames as $tagName) {
$paramInstance->add(AddTagsToMultipleRecordsParam::tagNames(), $tagName);
}

foreach($recordIds as $recordId)
{
foreach ($recordIds as $recordId) {
$paramInstance->add(AddTagsToMultipleRecordsParam::ids(), $recordId);
}

$paramInstance->add(AddTagsToMultipleRecordsParam::overWrite(), "false");

return $this->handleTagResponse(
$tagsOperations->addTagsToMultipleRecords($this->module_api_name,$paramInstance)
$tagsOperations->addTagsToMultipleRecords($this->module_api_name, $paramInstance)
);
}

/**
* @param array $recordIds
* @param array $tagNames
* @param array $recordIds
* @param array $tagNames
* @return array
* @throws SDKException
*/
Expand All @@ -306,13 +304,11 @@ public function removeTagsFromMultipleRecords(array $recordIds, array $tagNames)

$paramInstance = new ParameterMap();

foreach($tagNames as $tagName)
{
foreach ($tagNames as $tagName) {
$paramInstance->add(RemoveTagsFromMultipleRecordsParam::tagNames(), $tagName);
}

foreach($recordIds as $recordId)
{
foreach ($recordIds as $recordId) {
$paramInstance->add(RemoveTagsFromMultipleRecordsParam::ids(), $recordId);
}

Expand All @@ -326,7 +322,7 @@ public function removeTagsFromMultipleRecords(array $recordIds, array $tagNames)
}

/**
* @param string $tagId
* @param string $tagId
* @return array
* @throws SDKException
*/
Expand All @@ -342,7 +338,7 @@ public function getRecordCountForTag(string $tagId): array

//Call getRecordCountForTag method that takes paramInstance and tagId as parameter
return $this->handleTagResponse(
$tagsOperations->getRecordCountForTag($tagId,$paramInstance)
$tagsOperations->getRecordCountForTag($tagId, $paramInstance)
);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/ZohoController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Asciisd\Zoho\Http\Controllers;

use Asciisd\Zoho\Http\Requests\ZohoRedirectRequest;
use Asciisd\Zoho\Zoho;
use com\zoho\crm\api\exception\SDKException;
use Illuminate\Routing\Controller;
use Asciisd\Zoho\Http\Requests\ZohoRedirectRequest;

class ZohoController extends Controller
{
Expand All @@ -14,7 +14,7 @@ public function oauth2callback(ZohoRedirectRequest $request)
try {
Zoho::initialize($request->code);
} catch (SDKException $e) {
return 'Error while setting up Zoho CRM: ' . $e->getMessage();
return 'Error while setting up Zoho CRM: '.$e->getMessage();
}

return 'Zoho CRM has been set up successfully.';
Expand Down
4 changes: 2 additions & 2 deletions src/Models/Zohoable.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Asciisd\Zoho\Models;

use Asciisd\Zoho\Contracts\Repositories\ZohoableRepository;
use Asciisd\Zoho\Traits\Zohoable as ZohoableModel;
use Asciisd\Zoho\ZohoManager;
use Illuminate\Database\Eloquent\Model;
use Asciisd\Zoho\Traits\Zohoable as ZohoableModel;
use Asciisd\Zoho\Contracts\Repositories\ZohoableRepository;

abstract class Zohoable extends Model implements ZohoableRepository
{
Expand Down
Loading

0 comments on commit 555aeae

Please sign in to comment.