fix(rooms): seperate acitivities id from room id

Author: akoushke

src/adapters/RoomsJSONAdapter.js

@@ -55,7 +55,7 @@ export default class RoomsJSONAdapter extends RoomsAdapter {
    */
   getPreviousRoomActivities(ID) {
     return Observable.create((observer) => {
-      const data = !this.datasource[ID] ? [] : this.datasource[ID];
+      const data = !this.datasource[`${ID}-activities`] ? [] : this.datasource[`${ID}-activities`];
 
       observer.next(data);
 
@@ -72,7 +72,7 @@ export default class RoomsJSONAdapter extends RoomsAdapter {
    */
   getRoomActivities(ID) {
     return Observable.create((observer) => {
-      const data = !this.datasource[ID] ? [] : this.datasource[ID];
+      const data = !this.datasource[`${ID}-activities`] ? [] : this.datasource[`${ID}-activities`];
 
       observer.next(data);
 

src/adapters/RoomsJSONAdapter.test.js

@@ -2,18 +2,18 @@ import rooms from './../data/rooms';
 import RoomsJSONAdapter from './RoomsJSONAdapter';
 
 describe('Rooms JSON Adapter Interface', () => {
-  let roomsJSONAdapter, roomID, roomActivitiesID;
+  let roomsJSONAdapter, roomID;
 
   beforeEach(() => {
-    [roomID, roomActivitiesID] = Object.keys(rooms);
+    [roomID] = Object.keys(rooms);
     roomsJSONAdapter = new RoomsJSONAdapter(rooms);
   });
 
   test('getRoom() returns an observable', () => {
     expect(rxjs.isObservable(roomsJSONAdapter.getRoom())).toBeTruthy();
   });
 
-  test('getRoom() returns a person data', (done) => {
+  test('getRoom() returns a room data', (done) => {
     roomsJSONAdapter.getRoom(roomID).subscribe((data) => {
       expect(data).toEqual(rooms[roomID]);
       done();
@@ -48,8 +48,8 @@ describe('Rooms JSON Adapter Interface', () => {
   });
 
   test('getPreviousRoomActivities() returns an array of previous activity IDs', (done) => {
-    roomsJSONAdapter.getPreviousRoomActivities(roomActivitiesID).subscribe((data) => {
-      expect(data).toEqual(rooms[roomActivitiesID]);
+    roomsJSONAdapter.getPreviousRoomActivities(roomID).subscribe((data) => {
+      expect(data).toEqual(rooms[`${roomID}-activities`]);
       done();
     });
   });
@@ -79,8 +79,8 @@ describe('Rooms JSON Adapter Interface', () => {
   });
 
   test('getRoomActivities() returns an array of previous activity IDs', (done) => {
-    roomsJSONAdapter.getRoomActivities(roomActivitiesID).subscribe((data) => {
-      expect(data).toEqual(rooms[roomActivitiesID]);
+    roomsJSONAdapter.getRoomActivities(roomID).subscribe((data) => {
+      expect(data).toEqual(rooms[`${roomID}-activities`]);
       done();
     });
   });

src/adapters/index.js

@@ -4,3 +4,4 @@ export {default as PeopleJSONAdapter} from './PeopleJSONAdapter';
 export {default as ActivitiesAdapter} from './ActivitiesAdapter';
 export {default as ActivitiesJSONAdapter} from './ActivitiesJSONAdapter';
 export {default as RoomsAdapter} from './RoomsAdapter';
+export {default as RoomsJSONAdapter} from './RoomsJSONAdapter';