ami/tl-vikunja
1
0
Fork 0
Code

feat(views): return views with their projects

Browse Source
This commit is contained in:
kolaente 2024-03-14 09:36:39 +01:00
parent ee228106fc
commit 2fa3e2c2f5
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/models/project.go
View File

@ -80,6 +80,8 @@ type Project struct {
// The position this project has when querying all projects. See the tasks.position property on how to use this. // The position this project has when querying all projects. See the tasks.position property on how to use this.
Position float64 `xorm:"double null" json:"position"` Position float64 `xorm:"double null" json:"position"`
Views []*ProjectView `xorm:"-" json:"views"`
// A timestamp when this project was created. You cannot change this value. // A timestamp when this project was created. You cannot change this value.
Created time.Time `xorm:"created not null" json:"created"` Created time.Time `xorm:"created not null" json:"created"`
// A timestamp when this project was last updated. You cannot change this value. // A timestamp when this project was last updated. You cannot change this value.
@ -266,6 +268,9 @@ func (p *Project) ReadOne(s *xorm.Session, a web.Auth) (err error) {
return nil return nil
} }
err = s.
Where("project_id = ?", p.ID).
Find(&p.Views)
return return
} }
@ -587,6 +592,23 @@ func addProjectDetails(s *xorm.Session, projects []*Project, a web.Auth) (err er
subscriptions = make(map[int64][]*Subscription) subscriptions = make(map[int64][]*Subscription)
} }
views := []*ProjectView{}
err = s.
In("project_id", projectIDs).
Find(&views)
if err != nil {
return
}
viewMap := make(map[int64][]*ProjectView)
for _, v := range views {
if _, has := viewMap[v.ProjectID]; !has {
viewMap[v.ProjectID] = []*ProjectView{}
}
viewMap[v.ProjectID] = append(viewMap[v.ProjectID], v)
}
for _, p := range projects { for _, p := range projects {
if o, exists := owners[p.OwnerID]; exists { if o, exists := owners[p.OwnerID]; exists {
p.Owner = o p.Owner = o
@ -604,6 +626,11 @@ func addProjectDetails(s *xorm.Session, projects []*Project, a web.Auth) (err er
if subscription, exists := subscriptions[p.ID]; exists && len(subscription) > 0 { if subscription, exists := subscriptions[p.ID]; exists && len(subscription) > 0 {
p.Subscription = subscription[0] p.Subscription = subscription[0]
} }
vs, has := viewMap[p.ID]
if has {
p.Views = vs
}
} }
if len(fileIDs) == 0 { if len(fileIDs) == 0 {