Merge pull request #433 from sinfo/staging

Update 1.2.0

Author: nalves599

backend/src/models/company.go

@@ -38,6 +38,32 @@ type CompanyParticipation struct {
 
 	// Some random notes about this participation.
 	Notes string `json:"notes" bson:"notes"`
+
+  // Stand details
+  StandDetails StandDetails `json:"standDetails,omitempty" bson:"standDetails,omitempty"`
+
+  // Stand and days at the venue
+  Stands []Stand `json:"stands,omitempty" bson:"stands,omitempty"`
+
+}
+
+type Stand struct {
+  // Stand identifier
+  StandID string  `json:"standId" bson:"standId"`
+
+  // Day at the venue
+  Date *time.Time `json:"date,omitempty" bson:"date,omitempty"`
+}
+
+type StandDetails struct {
+  // Number of chairs required by the company
+  Chairs int `json:"chairs" bson:"chairs"`
+
+  // Require front table
+  Table bool `json:"table" bson:"table"`
+
+  // Require lettering
+  Lettering bool `json:"lettering" bson:"lettering"`
 }
 
 // CompanyBillingInfo of company
@@ -99,6 +125,12 @@ type CompanyParticipationPublic struct {
 
 	// Participation's package is a Package _id (see models.Package).
 	Package PackagePublic `json:"package,omitempty"`
+
+  // Stand details
+  StandDetails StandDetails `json:"standDetails,omitempty"`
+
+  // Days at the venue
+  Stands []Stand `json:"stands,omitempty"`
 }
 
 // CompanyPublic represents a company to be contacted by the team, that will hopefully participate

backend/src/models/session.go

@@ -62,6 +62,9 @@ type Session struct {
 	Title       string    `json:"title" bson:"title"`
 	Description string    `json:"description" bson:"description"`
 
+  // Session Image
+  Image string `json:"img,omitempty" bson:"img,omitempty"`
+
 	// Where the session is being held. Typically a room on the venue.
 	Place string `json:"place" bson:"place"`
 
@@ -89,6 +92,9 @@ type SessionPublic struct {
 	Title       string    `json:"title"`
 	Description string    `json:"description"`
 
+  // Session Image
+  Image string `json:"img,omitempty" bson:"img,omitempty"`
+
 	// Where the session is being held. Typically a room on the venue.
 	Place string `json:"place"`
 

backend/src/models/speaker.go

@@ -72,6 +72,9 @@ type Speaker struct {
 	// Bio of the speaker. Careful, this will be visible on our website!
 	Bio string `json:"bio" bson:"bio"`
 
+  // Company name
+  CompanyName string `json:"companyName" bson:"companyName"`
+
 	// This is only visible by the team. Praise and trash talk at will.
 	Notes          string                 `json:"notes" bson:"notes"`
 	Images         SpeakerImages          `json:"imgs" bson:"imgs"`
@@ -86,7 +89,7 @@ type SpeakerImagesPublic struct {
 
 	// Speaker's company photo. This is a URL pointing to the photo, stored somewhere. It will
 	// be visible on our website.
-	Company string `json:"company" bson:"company"`
+	Company string `json:"company,omitempty" bson:"company"`
 }
 
 type SpeakerParticipationPublic struct {
@@ -112,6 +115,9 @@ type SpeakerPublic struct {
 	// Bio of the speaker. Careful, this will be visible on our website!
 	Bio string `json:"bio" bson:"bio"`
 
+  // Company name
+  CompanyName string `json:"companyName,omitempty" bson:"companyName"`
+
 	Images         SpeakerImagesPublic          `json:"imgs" bson:"imgs"`
 	Participations []SpeakerParticipationPublic `json:"participation" bson:"participations"`
 }

backend/src/mongodb/company.go

@@ -319,6 +319,8 @@ func companyToPublic(company models.Company, eventID *int) (*models.CompanyPubli
 				Event:   p.Event,
 				Partner: participation.Partner,
 				Package: models.PackagePublic{},
+        StandDetails: participation.StandDetails,
+        Stands: participation.Stands,
 			}
 
 			if participation.Package != nil {

backend/src/mongodb/session.go

@@ -37,6 +37,7 @@ func sessionToPublic(session models.Session, eventID *int) (*models.SessionPubli
 		Begin:       session.Begin,
 		End:         session.End,
 		Title:       session.Title,
+		Image:       session.Image,
 		Description: session.Description,
 		Place:       session.Place,
 		Kind:        session.Kind,
@@ -492,55 +493,27 @@ func (s *SessionsType) GetSessions(options GetSessionsOptions) ([]*models.Sessio
 type GetSessionsPublicOptions struct {
 	EventID *int
 	Kind    *models.SessionKind
+	Company *primitive.ObjectID
+  Speaker *primitive.ObjectID
 }
 
 // GetPublicSessions gets all sessions specified with a query to be shown publicly
 func (s *SessionsType) GetPublicSessions(options GetSessionsPublicOptions) ([]*models.SessionPublic, error) {
 	ctx = context.Background()
 
 	var public = make([]*models.SessionPublic, 0)
-	var filtered = make([]*models.Session, 0)
 	var sessions []*models.Session
 	var err error
 
-	if currentPublicCompanies != nil {
-
-		var filtered = make([]*models.SessionPublic, 0)
-
-		if options.Kind != nil {
-
-			for _, s := range *currentPublicSessions {
-				if s.Kind == *options.Kind {
-					filtered = append(filtered, s)
-				}
-			}
-
-		} else {
-			filtered = *currentPublicSessions
-		}
-
-		// return cached value
-		return filtered, nil
-
-	}
-
-	sessions, err = Sessions.GetSessions(GetSessionsOptions{Event: options.EventID})
+  sessions, err = Sessions.GetSessions(GetSessionsOptions{
+    Event: options.EventID,
+    Kind: options.Kind,
+    Company: options.Company,
+    Speaker: options.Speaker})
 	if err != nil {
 		return nil, err
 	}
 
-	if options.Kind != nil {
-
-		for _, s := range sessions {
-			if s.Kind == *options.Kind {
-				filtered = append(filtered, s)
-			}
-		}
-
-	} else {
-		filtered = sessions
-	}
-
 	var event *models.Event
 	if options.EventID == nil {
 		event, err = Events.GetCurrentEvent()
@@ -554,15 +527,15 @@ func (s *SessionsType) GetPublicSessions(options GetSessionsPublicOptions) ([]*m
 		}
 	}
 
-	for _, session := range filtered {
+	for _, session := range sessions {
 		p, err := sessionToPublic(*session, &event.ID)
 		if err != nil {
 			return nil, err
 		}
 		public = append(public, p)
 	}
 
-	if options.EventID == nil && options.Kind == nil && currentPublicSessions == nil {
+	if options.EventID == nil && options.Kind == nil && options.Company == nil && options.Speaker == nil && currentPublicSessions == nil {
 		currentPublicSessions = &public
 	}
 

backend/src/mongodb/speaker.go

@@ -37,6 +37,7 @@ func speakerToPublic(speaker models.Speaker, eventID *int) (*models.SpeakerPubli
 		Name:  speaker.Name,
 		Bio:  speaker.Bio,
 		Title: speaker.Title,
+    CompanyName: speaker.CompanyName,
 		Images: models.SpeakerImagesPublic{
 			Speaker: speaker.Images.Speaker,
 			Company: speaker.Images.Company,

backend/src/router/session.go

@@ -150,6 +150,8 @@ func getPublicSessions(w http.ResponseWriter, r *http.Request) {
 
 	event := urlQuery.Get("event")
 	kind := urlQuery.Get("kind")
+  company := urlQuery.Get("company")
+	speaker := urlQuery.Get("speaker")
 
 	if len(event) > 0 {
 		eventValue, err := strconv.Atoi(event)
@@ -180,6 +182,28 @@ func getPublicSessions(w http.ResponseWriter, r *http.Request) {
 		options.Kind = kindValue
 	}
 
+	if len(company) > 0 {
+		companyValue, err := primitive.ObjectIDFromHex(company)
+
+		if err != nil {
+			json.NewEncoder(w).Encode(make([]*models.Session, 0))
+			return
+		}
+
+		options.Company = &companyValue
+	}
+
+	if len(speaker) > 0 {
+		speakerValue, err := primitive.ObjectIDFromHex(speaker)
+
+		if err != nil {
+			json.NewEncoder(w).Encode(make([]*models.Session, 0))
+			return
+		}
+
+		options.Speaker = &speakerValue
+	}
+
 	sessions, err := mongodb.Sessions.GetPublicSessions(options)
 
 	if err != nil {