Add deviceId to system state API

danesparza · Jul 28, 2017 · 32cb39e · 32cb39e
1 parent bcbef33
commit 32cb39e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/api/system.go b/api/system.go
@@ -14,6 +14,7 @@ type CurrentState struct {
 	ServerStartTime    time.Time `json:"starttime"`
 	ApplicationVersion string    `json:"appversion"`
 	DeviceRunning      bool      `json:"devicerunning"`
+	DeviceID           string    `json:"deviceId"`
 }
 
 // GetCurrentState gets the current running state of the application
@@ -22,13 +23,19 @@ func GetCurrentState(rw http.ResponseWriter, req *http.Request) {
 	//	Find out if the device is currently running:
 	activityDB := data.ActivityDB{
 		Database: viper.GetString("datastore.activity")}
-	response, _ := activityDB.GetLatestActivity()
+	latestActivity, _ := activityDB.GetLatestActivity()
 
-	//	Get the current datastore:
+	//	Get config information:
+	configDB := data.ConfigDB{
+		Database: viper.GetString("datastore.config")}
+	deviceID, _ := configDB.Get("deviceID")
+
+	//	Create a CurrentState type:
 	currentState := CurrentState{
 		ServerStartTime:    ApplicationStartTime,
-		DeviceRunning:      response.Type == data.ApplianceRunning,
+		DeviceRunning:      latestActivity.Type == data.ApplianceRunning,
 		ApplicationVersion: BuildVersion,
+		DeviceID:           deviceID.Value,
 	}
 
 	//	Serialize to JSON & return the response: