Skip to content

Add support for task.elapseditem.* methods in ApiClient and integra… #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 20, 2025
Merged

Add support for task.elapseditem.* methods in ApiClient and integra… #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3f1330
Add support for `task.elapseditem.*` methods in ApiClient and integra…
mesilov Jun 19, 2025
009ab67
Update test data provider for `isApplicationTokenValid` in `Bitrix24A…
mesilov Jun 19, 2025
69e41de
Simplify test data provider in `Bitrix24AccountInterfaceTest` by remo…
mesilov Jun 19, 2025
3ce7f4d
Expand test coverage for `Bitrix24AccountInterface` and `Bitrix24Part…
mesilov Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
### Fixed

- Fixed error in arguments in service for method `placement.bind`, [see details](https://github.com/bitrix24/b24phpsdk/issues/151)

- Fixed errors in `task.elapseditem.*` call in ApiClient [see details](https://github.com/bitrix24/b24phpsdk/issues/180)
### Changed

- ❗**️️BC** Changed contract `Bitrix24\SDK\Application\Contracts\Bitrix24Accounts\Entity\Bitrix24AccountInterface`, this change needs to process corner cases
Expand Down
10 changes: 9 additions & 1 deletion src/Core/ApiClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,15 @@ public function getResponse(string $apiMethod, array $parameters = []): Response
'task.commentitem.update',
'task.commentitem.getlist',
'task.commentitem.delete',
'task.commentitem.isactionallowed'
'task.commentitem.isactionallowed',
'task.elapseditem.add',
'task.elapseditem.update',
'task.elapseditem.get',
'task.elapseditem.getlist',
'task.elapseditem.delete',
'task.elapseditem.isactionallowed',
'task.elapseditem.getmanifest',
'tasks.task.add',
];
if (!in_array($apiMethod, $strictApiMethods, true)) {
$url .= '?' . $this->requestIdGenerator->getQueryStringParameterName() . '=' . $requestId;
Expand Down
23 changes: 21 additions & 2 deletions tests/Application/Contracts/Bitrix24Accounts/Entity/Bitrix24AccountInterfaceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ final public function testApplicationUninstalled(
* @throws InvalidArgumentException
*/
#[Test]
#[DataProvider('bitrix24AccountWithStatusNewDataProvider')]
#[DataProvider('bitrix24AccountWithWalidTokenDataProvider')]
#[TestDox('test isApplicationTokenValid method')]
final public function testIsApplicationTokenValid(
Uuid $uuid,
Expand Down Expand Up @@ -531,6 +531,9 @@ final public function testGetUpdatedAt(
int $applicationVersion,
Scope $applicationScope,
string $applicationToken,
int $newApplicationVersion,
Scope $newApplicationScope,
?Throwable $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -681,6 +684,22 @@ final public function testMarkAsActive(
$this->assertEquals($comment, $bitrix24Account->getComment());
}

public static function bitrix24AccountWithWalidTokenDataProvider(): Generator
{
yield 'valid-update' => [
Uuid::v7(),
12345,
true,
true,
'member123',
'https://example.com',
new AuthToken('access_token', 'refresh_token', 1609459200),
1,
new Scope(['crm', 'task']),
'application_token'
];
}

/**
* @throws UnknownScopeCodeException
*/
Expand Down Expand Up @@ -889,4 +908,4 @@ public static function bitrix24AccountDataProvider(): Generator
new Scope(['crm', 'task'])
];
}
}
}
84 changes: 61 additions & 23 deletions ...lication/Contracts/Bitrix24Accounts/Repository/Bitrix24AccountRepositoryInterfaceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ final public function testSave(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -113,7 +115,9 @@ final public function testDeleteHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -164,7 +168,9 @@ final public function testDeleteNotInDeletedState(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -228,7 +234,9 @@ final public function testFindOneAdminByMemberIdWithHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -266,7 +274,9 @@ final public function testFindOneAdminByMemberIdWithSimpleUser(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -304,7 +314,9 @@ final public function testFindByMemberIdWithHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -365,7 +377,9 @@ final public function testFindByMemberIdWithBlockedAccountHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -409,7 +423,9 @@ final public function testFindByMemberIdWithAccountStatusAccountNotFound(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -451,7 +467,9 @@ final public function testFindByMemberIdWithIsAdminHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -492,7 +510,9 @@ final public function testFindByMemberIdWithIsAdminNotFound(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -529,12 +549,13 @@ final public function testFindByMemberIdWithB24UserIdNotFound(
int $bitrix24UserId,
bool $isBitrix24UserAdmin,
bool $isMasterAccount,

string $memberId,
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -571,12 +592,13 @@ final public function testFindByMemberIdWithAllArgs(
int $bitrix24UserId,
bool $isBitrix24UserAdmin,
bool $isMasterAccount,

string $memberId,
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -622,7 +644,9 @@ final public function testFindByDomainWithHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -683,7 +707,9 @@ final public function testFindByDomainWithBlockedAccountHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -727,7 +753,9 @@ final public function testFindByDomainWithAccountStatusAccountNotFound(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -769,7 +797,9 @@ final public function testFindByDomainWithIsAdminHappyPath(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -810,7 +840,9 @@ final public function testFindByDomainWithIsAdminNotFound(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -851,7 +883,9 @@ final public function testFindByDomainWithAllArgs(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -889,7 +923,9 @@ final public function testFindByApplicationToken(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -940,7 +976,9 @@ final public function testFindByApplicationTokenWithUnknownToken(
string $domainUrl,
AuthToken $authToken,
int $applicationVersion,
Scope $applicationScope
Scope $applicationScope,
string $applicationToken,
?object $throwable
): void {
$bitrix24Account = $this->createBitrix24AccountImplementation(
$uuid,
Expand Down Expand Up @@ -985,4 +1023,4 @@ public static function bitrix24AccountForInstallDataProvider(): Generator
null
];
}
}
}
Loading