Skip to content

RSH1c4 and RSH1c5 #78

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
jdavid merged 2 commits into from
Jun 6, 2019
Merged

RSH1c4 and RSH1c5 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b996184
RSH1c4 push->admin->channelSubscriptions->remove
jdavid Jun 5, 2019
3c9e9ca
RSH1c5 push->admin->channelSubscriptions->removeWhere
jdavid Jun 5, 2019
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
20 changes: 20 additions & 0 deletions src/PushChannelSubscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,24 @@ public function listChannels (array $params = []) {
$cipher = false, 'GET', $path, $params );
}

/**
* Removes the given channel subscription.
*
* @param string $subscription the id of the device
*/
public function remove ($subscription) {
$params = $subscription->toArray();
$path = '/push/channelSubscriptions';
return $this->ably->delete( $path, [], $params, false );
}

/**
* Removes the channel subscriptions identified by the given parameters.
*
* @param string $subscription the id of the device
*/
public function removeWhere (array $params = []) {
$path = '/push/channelSubscriptions';
return $this->ably->delete( $path, [], $params, false );
}
}
90 changes: 90 additions & 0 deletions tests/PushChannelSubscriptionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,94 @@ public function testSaveInvalid($data) {
self::$ably->push->admin->channelSubscriptions->save($data);
}


/**
* RSH1c4
*/
public function testRemove() {
$admin = self::$ably->push->admin;
$channelSubscriptions = $admin->channelSubscriptions;

// Register device
$data = deviceData();
$admin->deviceRegistrations->save($data);
$deviceId = $data['id'];
$clientId = $data['clientId'];

// Remove by device id
$subscription = $channelSubscriptions->save([
'channel' => 'pushenabled:test',
'deviceId' => $deviceId,
]);

$params = ['deviceId' => $deviceId];
$response = $channelSubscriptions->list_($params);
$this->assertEquals(1, count($response->items));
$channelSubscriptions->remove($subscription);
$response = $channelSubscriptions->list_($params);
$this->assertEquals(0, count($response->items));

// Remove by client id
$subscription = $channelSubscriptions->save([
'channel' => 'pushenabled:test',
'clientId' => $clientId,
]);

$params = ['clientId' => $clientId];
$response = $channelSubscriptions->list_($params);
$this->assertEquals(1, count($response->items));
$channelSubscriptions->remove($subscription);
$response = $channelSubscriptions->list_($params);
$this->assertEquals(0, count($response->items));

// Remove again, no error
$channelSubscriptions->remove($subscription);
}


/**
* RSH1c5
*/
public function testRemoveWhere() {
$admin = self::$ably->push->admin;
$channelSubscriptions = $admin->channelSubscriptions;

// Register device
$data = deviceData();
$admin->deviceRegistrations->save($data);
$deviceId = $data['id'];
$clientId = $data['clientId'];

// Remove by device id
$channelSubscriptions->save([
'channel' => 'pushenabled:test',
'deviceId' => $deviceId,
]);

$params = ['deviceId' => $deviceId];
$response = $channelSubscriptions->list_($params);
$this->assertEquals(1, count($response->items));
$channelSubscriptions->removeWhere($params);
sleep(3); // Deletion is async: wait a few seconds
$response = $channelSubscriptions->list_($params);
$this->assertEquals(0, count($response->items));

// Remove by client id
$channelSubscriptions->save([
'channel' => 'pushenabled:test',
'clientId' => $clientId,
]);

$params = ['clientId' => $clientId];
$response = $channelSubscriptions->list_($params);
$this->assertEquals(1, count($response->items));
$channelSubscriptions->removeWhere($params);
sleep(3); // Deletion is async: wait a few seconds
$response = $channelSubscriptions->list_($params);
$this->assertEquals(0, count($response->items));

// Remove again, no error
$channelSubscriptions->removeWhere($params);
}

}