Skip to content

Commit

Permalink
fix unit tests failing CI, on getMeetings with locked rooms
Browse files Browse the repository at this point in the history
  • Loading branch information
bitkarrot committed Sep 17, 2024
1 parent 48d5fc8 commit 346cb22
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
31 changes: 19 additions & 12 deletions app/src/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -875,18 +875,25 @@ function startServer() {
const { host, authorization } = req.headers;
const api = new ServerApi(host, authorization);
// Get meetings
const meetings = api.getMeetings(roomList);
meetings.forEach((room) => {
// Replace the "peers" array with its length
room.peers = room.peers.length;
});
res.json({ meetings: meetings });
// log.debug the output if all done
log.debug('HiveTalk get meetings - Authorized', {
header: req.headers,
body: req.body,
meetings: meetings,
});
try {
const meetings = api.getMeetings(roomList);
meetings.forEach((room) => {
// Replace the "peers" array with its length
room.peers = room.peers.length;
});
res.json({ meetings: meetings });
// log.debug the output if all done
log.debug('HiveTalk get meetings - Authorized', {
header: req.headers,
body: req.body,
meetings: meetings,
});
} catch (error) {
// assume error thrown if no meetings is undefined,
// so return an empty array
return res.json({ meetings: [] });
}

});

// request meetings list
Expand Down
10 changes: 5 additions & 5 deletions app/src/ServerApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ module.exports = class ServerApi {
}

getMeetings(roomList) {
// Check if roomList is empty
if (roomList.size === 0) {
return []; // Return an empty array if there are no rooms
}
const meetings = Array.from(roomList.entries()).map(([id, room]) => {
// hide room if locked
if (!room.isLocked()) {
if (!room._isLocked) {
const peers = Array.from(room.peers.values()).map(
({
peer_info: {
Expand All @@ -33,10 +37,6 @@ module.exports = class ServerApi {
peer_npub,
peer_pubkey,
peer_lnaddress,
// peer_video,
// peer_audio,
// peer_screen,
// peer_hand,
},
}) => ({
name: peer_name,
Expand Down
23 changes: 8 additions & 15 deletions tests/test-ServerAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,18 @@ describe('test-ServerAPI', () => {
const roomList = new Map([
[
'room1',
{
{
_isLocked: false,
peers: new Map([
[
'peer1',
{
peer_info: {
peer_name: 'John Doe',
peer_presenter: true,
peer_video: true,
peer_audio: true,
peer_screen: false,
peer_hand: false,
os_name: 'Windows',
os_version: '10',
browser_name: 'Chrome',
browser_version: '100',
peer_npub: 'johndoe@npub1',
peer_pubkey: 'johndoe@pubkey1',
peer_lnaddress: '[email protected]',
},
},
],
Expand All @@ -75,12 +71,9 @@ describe('test-ServerAPI', () => {
{
name: 'John Doe',
presenter: true,
video: true,
audio: true,
screen: false,
hand: false,
os: 'Windows 10',
browser: 'Chrome 100',
npub: 'johndoe@npub1',
pubkey: 'johndoe@pubkey1',
lnaddress: '[email protected]',
},
],
},
Expand Down

0 comments on commit 346cb22

Please sign in to comment.