From 8e713ae8dae74fe2f8f0758cc3d351c79173e8dc Mon Sep 17 00:00:00 2001 From: zegkljan Date: Thu, 3 Aug 2023 22:46:20 +0200 Subject: [PATCH] Existing proposals in data. * Data contains existing proposals too. #2 --- models/models.go | 1 + server/server.go | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/models/models.go b/models/models.go index 8acd7bf..9735fc5 100644 --- a/models/models.go +++ b/models/models.go @@ -91,6 +91,7 @@ type HandshakeResponse struct { type Data struct { Users []User `json:"users"` Features []Feature `json:"features"` + Proposals []Proposal `json:"proposals"` PhotoMetadata map[string]PhotoMetadata `json:"photo_metadata,omitempty"` } diff --git a/server/server.go b/server/server.go index 0d3dd1a..3386ec5 100644 --- a/server/server.go +++ b/server/server.go @@ -293,10 +293,15 @@ func (s *Server) getData(conn *sqlite.Conn) (data models.Data, err error) { if err != nil { return models.Data{}, fmt.Errorf("failed to retreive features: %w", err) } + proposals, err := s.getProposals(conn) + if err != nil { + return models.Data{}, fmt.Errorf("failed to retrieve proposals: %w", err) + } return models.Data{ - Users: people, - Features: features, + Users: people, + Features: features, + Proposals: proposals, }, nil }