From 484c593d7099618726381ed202b6ed1a39539c64 Mon Sep 17 00:00:00 2001
From: Carlus Henry <carlushenry@gmail.com>
Date: Thu, 12 Mar 2015 20:59:54 -0400
Subject: [PATCH] adding the conference id.

---
 .../com/ioextendedgr/web/builder/RoomViewBuilder.java    | 1 +
 src/main/java/com/ioextendedgr/web/viewDto/RoomView.java | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/com/ioextendedgr/web/builder/RoomViewBuilder.java b/src/main/java/com/ioextendedgr/web/builder/RoomViewBuilder.java
index ab3a6a2..92ccd1b 100644
--- a/src/main/java/com/ioextendedgr/web/builder/RoomViewBuilder.java
+++ b/src/main/java/com/ioextendedgr/web/builder/RoomViewBuilder.java
@@ -14,6 +14,7 @@ public static RoomView build(Room data) {
 		view.setId(data.getId());
 		view.setShortDesc(data.getShortDesc());
 		view.setFullDesc(data.getFullDesc());
+		view.setConferenceId(data.getConference().getId());
 
 		return view;
 	}
diff --git a/src/main/java/com/ioextendedgr/web/viewDto/RoomView.java b/src/main/java/com/ioextendedgr/web/viewDto/RoomView.java
index d0f87eb..3bd7a54 100644
--- a/src/main/java/com/ioextendedgr/web/viewDto/RoomView.java
+++ b/src/main/java/com/ioextendedgr/web/viewDto/RoomView.java
@@ -3,6 +3,7 @@
 public class RoomView {
 
 	private Integer id;
+	private Integer conferenceId;
 	private String shortDesc;
 	private String fullDesc;
 
@@ -29,4 +30,12 @@ public String getFullDesc() {
 	public void setFullDesc(String fullDesc) {
 		this.fullDesc = fullDesc;
 	}
+
+	public Integer getConferenceId() {
+		return conferenceId;
+	}
+
+	public void setConferenceId(Integer conferenceId) {
+		this.conferenceId = conferenceId;
+	}
 }