zenermerps/GoGronkh
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Updating APIv3 to work with the new changes

Browse source
This commit is contained in:
Andreas Mieke 2016-02-28 21:45:55 +01:00
parent 5938e7a63d
commit 310d99fa9a
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gserver/apiv3/apiv3.go
View file

@ -182,7 +182,7 @@ func GetSearch(c *gin.Context) {
lps := 0
lts := 0
eps := 0
database.Db.Model(database.LetsPlay{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Count(&lps)
database.Db.Model(database.LetsPlay{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?) AND aired IS NOT NULL AND merge_id IS NULL", term).Count(&lps)
database.Db.Model(database.LetsTest{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Count(&lts)
database.Db.Model(database.Episode{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Count(&eps)
response := gin.H{"lets-plays": lps, "tests": lts, "episodes": eps}
@ -193,7 +193,7 @@ func GetSearch(c *gin.Context) {
} else if kind == "lets-plays" {
var lps []database.LetsPlay
var ALPs []LetsPlay
database.Db.Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Find(&lps)
database.Db.Where("to_tsvector('german', name) @@ to_tsquery('german', ?) AND aired IS NOT NULL AND merge_id IS NULL", term).Find(&lps)
copier.Copy(&ALPs, &lps)
if HandleEtag(c, fmt.Sprintf("%#v", ALPs)) {
return

8
gserver/apiv3/models.go
View file

@ -181,11 +181,15 @@ func (ep *Episode) Slug(s sql.NullString) {
}
func (ep *Episode) Name(s sql.NullString) {
ep.AName = s.String
ep.AName = "Folge 0: " + s.String
}
func (ep *Episode) Episode(i sql.NullInt64) {
ep.AEpisode = i.Int64
ep.AEpisode = ep.AEpisode + i.Int64
}
func (ep *Episode) Season(i sql.NullInt64) {
ep.AEpisode = ep.AEpisode + 10000 * i.Int64
}
func (ep *Episode) ThumbS(s sql.NullString) {