michal/oko-server
1
0
Fork 0
mirror of https://github.com/Cernobor/oko-server.git synced 2025-02-24 08:27:17 +00:00
Code Issues Projects Releases Wiki Activity

Existing proposals in data.
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source 
* Data contains existing proposals too.

#2
This commit is contained in:
zegkljan 2023-08-03 22:46:20 +02:00
parent 8440e3b7d7
commit 8e713ae8da
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/models.go
View File

@ -91,6 +91,7 @@ type HandshakeResponse struct {
type Data struct { type Data struct {
Users []User `json:"users"` Users []User `json:"users"`
Features []Feature `json:"features"` Features []Feature `json:"features"`
Proposals []Proposal `json:"proposals"`
PhotoMetadata map[string]PhotoMetadata `json:"photo_metadata,omitempty"` PhotoMetadata map[string]PhotoMetadata `json:"photo_metadata,omitempty"`
} }

9
server/server.go
View File

@ -293,10 +293,15 @@ func (s *Server) getData(conn *sqlite.Conn) (data models.Data, err error) {
if err != nil { if err != nil {
return models.Data{}, fmt.Errorf("failed to retreive features: %w", err) 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{ return models.Data{
Users: people, Users: people,
Features: features, Features: features,
Proposals: proposals,
}, nil }, nil
} }