Merge pull request #279 from nickbarry/furniture

feat(frontend): Prevent users from ever seeing non-price placeholder

src/furniture/actions/furniture.action.js

@@ -19,11 +19,6 @@ export function addFurniture(roomName, furnitureProps) {
   let furnitureName = furnitureProps.itemName;
   delete furnitureProps.itemName;
 
-  // If there is no price, create a placeholder field
-  if (!furnitureProps.price) {
-    furnitureProps.price = 'literally priceless';
-  }
-
   //create new Obj to pass to database
   let furnitureObj = {};
   //only pass over defined variables to stop undefined from interrupting database call
@@ -32,8 +27,12 @@ export function addFurniture(roomName, furnitureProps) {
       furnitureObj[prop] = furnitureProps[prop];
     }
   }
-  //database call
-  databaseAPI.updateFurniture(roomName, furnitureName, furnitureObj)
+
+  //database call; make sure price isn't falsy
+  const dbFurnitureObj = furnitureProps.price ?
+    furnitureObj :
+    Object.assign(_.cloneDeep(furnitureObj), { price: 'literally priceless' });
+  databaseAPI.updateFurniture(roomName, furnitureName, dbFurnitureObj);
 
   //send the expected value to the reducer
   return {
@@ -63,6 +62,9 @@ export function updateFurniture(originalFurnitureName, roomName, currentFurnitur
     controlsClick(null, 'submit');
   }
 
+  // If there is no price, create a placeholder field
+  newProps.price = newProps.price || 'literally priceless';
+
   // Iterate through the new furniture properties, and merge them with the current
   // furniture properties. The new object should not any undefined values. We also want to ignore the 'itemName'
   // property, which shouldn't be stored as a property of the furniture.

src/rooms/actions/rooms.action.js

@@ -112,7 +112,7 @@ export function selectRoom(roomName) {
 export const GET_ROOMS = 'GET_ROOMS';
 export function getRooms() {
   //database call with promise stored in rooms
-  let rooms = databaseAPI.getRooms();
+  const rooms = databaseAPI.getRooms();
 
   return {
     type: GET_ROOMS,

src/rooms/reducers/rooms.reducer.js

@@ -14,12 +14,28 @@ const roomsReducer = (state = {}, action) => {
       newState = _.cloneDeep(state);
       newState[action.room].design = action.design;
       return newState;
+
     //handles initial pull from db
     case GET_ROOMS:
-      let rooms = action.payload.val();
-      for (var roomName in rooms) {
-        if (roomName) {
+      const rooms = action.payload.val();
+      //const roomNames = Object.keys(rooms);
+      //roomNames.forEach(room => {
+      //  const roomFurniture = rooms[room].furniture;
+      //  const furnitureNames = Object.keys(roomFurniture);
+      //});
+
+      for (let roomName in rooms) {
+        if (rooms.hasOwnProperty(roomName)) {
           let room = rooms[roomName];
+
+          // Replace any furniture with price of 'literally priceless' with undefined
+          for (let furnitureName in room.furniture) {
+            if (room.furniture[furnitureName].price === 'literally priceless') {
+              rooms[roomName].furniture[furnitureName].price = undefined;
+            }
+          }
+
+          // Set up the room's design object
           let design = room.design;
           let designArr = [];
           for (var designObjName in design) {