Merge branch 'master' of github.uconn.edu:jar07014/Thermocontroller

pid1 · May 1, 2015 · 5879a1e · 5879a1e
2 parents 1dd9dad + a3185f0
commit 5879a1e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class
diff --git a/out/MAIN.jar b/out/MAIN.jar
diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java
@@ -58,7 +58,10 @@ public void setDesiredTempForSerialNumber(String serialnumber, String desiredtem
 	public String getDevicesFromEmail(String email){
 		return this.getUserFromEmail(email).get("devices");
 	}
-
+
+	public void giveUserAccessToDeviceByEmailAndSerialNumber(String email, String serialNumber){
+		this.updateTable("UserTable", email, "devices", serialNumber);
+	}
 
 	@Override
 	public void datastructureLogEvent(String query) {

diff --git a/src/server/server.java b/src/server/server.java
@@ -41,9 +41,12 @@ public server() throws Exception {
 		String adminPassword = "admin";
 		String ip = "127.0.0.1";
 		String email = "admin@uconn.edu";
-		String serialNumber = "1.1";
+		String serialNumber = "00000011TEST";
+
         dataStorage = new Database(this);
 		dataStorage.createUser(email, adminPassword, ip, serialNumber);
+        dataStorage.giveUserAccessToDeviceByEmailAndSerialNumber(email, serialNumber);
+        System.out.println(dataStorage.getDevicesFromEmail("admin@uconn.edu"));
 		this.startServerListenerThreadCurrentTemp();
         dataStorage.printStruct();
         instance = this;