Refactor storage to support shallow types.

Add Client to storage.
Fix client resizing issues.

handlers/get_session.go

@@ -2,21 +2,38 @@ package handlers
 
 import (
 	"encoding/json"
+	"log"
 	"net/http"
 
 	"github.com/gorilla/mux"
+	"github.com/play-with-docker/play-with-docker/pwd/types"
 )
 
+type SessionInfo struct {
+	*types.Session
+	Instances map[string]*types.Instance `json:"instances"`
+}
+
 func GetSession(rw http.ResponseWriter, req *http.Request) {
 	vars := mux.Vars(req)
 	sessionId := vars["sessionId"]
 
 	session := core.SessionGet(sessionId)
-
 	if session == nil {
 		rw.WriteHeader(http.StatusNotFound)
 		return
 	}
 
-	json.NewEncoder(rw).Encode(session)
+	instances, err := core.InstanceFindBySession(session)
+	if err != nil {
+		log.Println(err)
+		rw.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	is := map[string]*types.Instance{}
+	for _, i := range instances {
+		is[i.Name] = i
+	}
+
+	json.NewEncoder(rw).Encode(SessionInfo{session, is})
 }