Skip to content

Commit 21b2cb7

Browse files
committed
Rename findByMemberId method to findByBitrix24AccountMemberId in ApplicationInstallationRepositoryInterface and update implementations, tests, and CHANGELOG.
Signed-off-by: mesilov <[email protected]>
1 parent b572a3a commit 21b2cb7

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
### Changed
101101

102102
- Added optional argument in method `Bitrix24AccountRepositoryInterface::findByMemberId` [see details](https://github.com/bitrix24/b24phpsdk/issues/223)
103+
- Changed method name `ApplicationInstallationRepositoryInterface::findByMemberId` to
104+
`ApplicationInstallationRepositoryInterface::findByBitrix24AccountMemberId` [see details](https://github.com/bitrix24/b24phpsdk/issues/226)
103105

104106
## 1.5.0 – 2025.08.01
105107

src/Application/Contracts/ApplicationInstallations/Repository/ApplicationInstallationRepositoryInterface.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public function getById(Uuid $uuid): ApplicationInstallationInterface;
4242
*/
4343
public function delete(Uuid $uuid): void;
4444

45-
/**
46-
* Find application installation by bitrix24 account id
47-
**/
48-
public function findByBitrix24AccountId(Uuid $uuid): ?ApplicationInstallationInterface;
49-
5045
/**
5146
* Find application installation by external id
5247
*
@@ -57,16 +52,21 @@ public function findByBitrix24AccountId(Uuid $uuid): ?ApplicationInstallationInt
5752
public function findByExternalId(string $externalId): array;
5853

5954
/**
60-
* Find application installation by memberId
55+
* Find application installation by application token
6156
*
62-
* @param non-empty-string $memberId
57+
* @param non-empty-string $applicationToken
6358
*/
64-
public function findByMemberId(string $memberId): ?ApplicationInstallationInterface;
59+
public function findByApplicationToken(string $applicationToken): ?ApplicationInstallationInterface;
6560

6661
/**
67-
* Find application installation by application token
62+
* Find application installation by related Bitrix24 account member_id
6863
*
69-
* @param non-empty-string $applicationToken
64+
* @param non-empty-string $memberId
7065
*/
71-
public function findByApplicationToken(string $applicationToken): ?ApplicationInstallationInterface;
66+
public function findByBitrix24AccountMemberId(string $memberId): ?ApplicationInstallationInterface;
67+
68+
/**
69+
* Find application installation by bitrix24 account id
70+
**/
71+
public function findByBitrix24AccountId(Uuid $uuid): ?ApplicationInstallationInterface;
7272
}

tests/Application/Contracts/ApplicationInstallations/Repository/ApplicationInstallationRepositoryInterfaceTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ final public function testFindByMemberId(
434434
$flusher->flush();
435435

436436
$memberId = 'test-member-' . Uuid::v7()->toRfc4122();
437-
$result = $appInstallationRepo->findByMemberId($memberId);
437+
$result = $appInstallationRepo->findByBitrix24AccountMemberId($memberId);
438438
$this->assertTrue($result === null || $result instanceof ApplicationInstallationInterface);
439439
}
440440

@@ -458,7 +458,7 @@ final public function testFindByMemberIdWithUnknownId(
458458
$appInstallationRepo = $this->createApplicationInstallationRepositoryImplementation();
459459

460460
$memberId = 'unknown-member-' . Uuid::v7()->toRfc4122();
461-
$this->assertNull($appInstallationRepo->findByMemberId($memberId));
461+
$this->assertNull($appInstallationRepo->findByBitrix24AccountMemberId($memberId));
462462
}
463463

464464
#[Test]
@@ -481,7 +481,7 @@ final public function testFindByMemberIdWithEmptyId(
481481
$appInstallationRepo = $this->createApplicationInstallationRepositoryImplementation();
482482

483483
$this->expectException(InvalidArgumentException::class);
484-
$appInstallationRepo->findByMemberId('');
484+
$appInstallationRepo->findByBitrix24AccountMemberId('');
485485
}
486486

487487
#[Test]

tests/Unit/Application/Contracts/ApplicationInstallations/Repository/InMemoryApplicationInstallationRepositoryImplementation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function findByExternalId(string $externalId): array
105105
/**
106106
* @throws InvalidArgumentException
107107
*/
108-
public function findByMemberId(string $memberId): ?ApplicationInstallationInterface
108+
public function findByBitrix24AccountMemberId(string $memberId): ?ApplicationInstallationInterface
109109
{
110110
$this->logger->debug('InMemoryApplicationInstallationRepositoryImplementation.findByMemberId', ['memberId' => $memberId]);
111111

0 commit comments

Comments
 (0)