Merge pull request #99 from builderscon/topic/issue-98

Properly decorate the session
builderscon · Jul 9, 2016 · d82d178 · d82d178
2 parents 45891c3 + 8417e42
commit d82d178
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 13 deletions.
diff --git a/octav/handlers.go b/octav/handlers.go
@@ -527,13 +527,18 @@ func doCreateSession(ctx context.Context, w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	if err := tx.Commit(); err != nil {
+	v := model.Session{}
+	if err := v.FromRow(vdb); err != nil {
 		httpError(w, `CreateSession`, http.StatusInternalServerError, err)
 		return
 	}
 
-	v := model.Session{}
-	if err := v.FromRow(vdb); err != nil {
+	if err := s.Decorate(tx, &v); err != nil {
+		httpError(w, `LookupSession`, http.StatusInternalServerError, err)
+		return
+	}
+
+	if err := tx.Commit(); err != nil {
 		httpError(w, `CreateSession`, http.StatusInternalServerError, err)
 		return
 	}
@@ -1114,12 +1119,20 @@ func doLookupSession(ctx context.Context, w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	if payload.Lang.Valid() {
-		s := service.Session{}
-		if err := s.ReplaceL10NStrings(tx, &v, payload.Lang.String); err != nil {
-			httpError(w, `LookupSession`, http.StatusInternalServerError, err)
-			return
-		}
+	s := service.Session{}
+	if err := s.Decorate(tx, &v); err != nil {
+		httpError(w, `LookupSession`, http.StatusInternalServerError, err)
+		return
+	}
+
+	if !payload.Lang.Valid() {
+		httpJSON(w, v)
+		return
+	}
+
+	if err := s.ReplaceL10NStrings(tx, &v, payload.Lang.String); err != nil {
+		httpError(w, `LookupSession`, http.StatusInternalServerError, err)
+		return
 	}
 
 	httpJSON(w, v)

diff --git a/octav/model/interface.go b/octav/model/interface.go
@@ -52,7 +52,7 @@ type RoomList []Room
 type Session struct {
 	ID                string      `json:"id"`
 	ConferenceID      string      `json:"conference_id"`
-	RoomID            string      `json:"room_id"`
+	RoomID            string      `json:"room_id,omitempty"`
 	SpeakerID         string      `json:"speaker_id"`
 	Title             string      `json:"title" l10n:"true"`
 	Abstract          string      `json:"abstract" l10n:"true"`
@@ -73,9 +73,9 @@ type Session struct {
 	HasInterpretation bool        `json:"has_interpretation"`
 	Status            string      `json:"status"`
 	Confirmed         bool        `json:"confirmed"`
-	Conference        *Conference `json:"conference"` // only populated for JSON response
-	Room              *Room       `json:"room"`       // only populated for JSON response
-	Speaker           *User       `json:"speaker"`    // only populated for JSON response
+	Conference        *Conference `json:"conference,omitempy"` // only populated for JSON response
+	Room              *Room       `json:"room,omitempty"`       // only populated for JSON response
+	Speaker           *User       `json:"speaker,omitempty"`    // only populated for JSON response
 }
 type SessionList []Session
 

diff --git a/octav/service/session.go b/octav/service/session.go
@@ -4,6 +4,7 @@ import (
 	"github.com/builderscon/octav/octav/db"
 	"github.com/builderscon/octav/octav/model"
 	"github.com/builderscon/octav/octav/tools"
+	"github.com/pkg/errors"
 )
 
 func (v *Session) populateRowForCreate(vdb *db.Session, payload model.CreateSessionRequest) error {
@@ -188,3 +189,28 @@ func (v *Session) LoadByConference(tx *db.Tx, vdbl *db.SessionList, cid string,
 	return nil
 }
 
+func (v *Session) Decorate(tx *db.Tx, session *model.Session) error {
+	// session must be associated with a conference
+	conf := model.Conference{}
+	if err := conf.Load(tx, session.ConferenceID); err != nil {
+		return errors.Wrap(err, "failed to load conference")
+	}
+	session.Conference = &conf
+
+	// ... but not necessarily with a room
+	if session.RoomID != "" {
+		room := model.Room{}
+		if err := conf.Load(tx, session.RoomID); err != nil {
+			return errors.Wrap(err, "failed to load room")
+		}
+		session.Room = &room
+	}
+
+	speaker := model.User{}
+	if err := speaker.Load(tx, session.SpeakerID); err != nil {
+		return errors.Wrap(err, "failed to load speaker")
+	}
+	session.Speaker = &speaker
+
+	return nil
+}