diff options
Diffstat (limited to 'src/db')
-rw-r--r-- | src/db/go.mod | 4 | ||||
-rw-r--r-- | src/db/go.sum | 6 | ||||
-rw-r--r-- | src/db/talk.go | 50 |
3 files changed, 60 insertions, 0 deletions
diff --git a/src/db/go.mod b/src/db/go.mod index 4e70ab6..2c20fbf 100644 --- a/src/db/go.mod +++ b/src/db/go.mod @@ -3,6 +3,10 @@ module git.darknebu.la/chaosdorf/freitagsfoo/src/db go 1.13 require ( +<<<<<<< HEAD + git.darknebu.la/chaosdorf/freitagsfoo/src/structs v0.0.0-20200718235609-fc63adf55849 +======= +>>>>>>> refs/remotes/origin/master github.com/go-pg/pg/v9 v9.1.6 github.com/google/uuid v1.1.1 github.com/sirupsen/logrus v1.6.0 diff --git a/src/db/go.sum b/src/db/go.sum index eb7a67e..5efb5a8 100644 --- a/src/db/go.sum +++ b/src/db/go.sum @@ -11,6 +11,12 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +<<<<<<< HEAD +git.darknebu.la/chaosdorf/freitagsfoo v0.0.0-20200718235609-fc63adf55849 h1:xI4zrY9O8OoR7ais9O+b+ntKoKi4Ln4mb2iUys/e66k= +git.darknebu.la/chaosdorf/freitagsfoo/src/structs v0.0.0-20200718235609-fc63adf55849 h1:dkaulG2hAwns3QvFwFQEq2DVhiRsGPKvDmV5VrI3sfQ= +git.darknebu.la/chaosdorf/freitagsfoo/src/structs v0.0.0-20200718235609-fc63adf55849/go.mod h1:dxRyc1J0ktxxbrlUpd3Uujtx+KgGGidcIpfFBT5ftBc= +======= +>>>>>>> refs/remotes/origin/master github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/src/db/talk.go b/src/db/talk.go index c286aa8..34a245a 100644 --- a/src/db/talk.go +++ b/src/db/talk.go @@ -2,6 +2,10 @@ package db import ( "fmt" +<<<<<<< HEAD + "time" +======= +>>>>>>> refs/remotes/origin/master "git.darknebu.la/chaosdorf/freitagsfoo/src/structs" pg "github.com/go-pg/pg/v9" @@ -21,7 +25,11 @@ func InsertTalk(db *pg.DB, talk *structs.Talk) error { // UpcomingTalksLimited returns the next 3 upcoming talks func UpcomingTalksLimited(db *pg.DB) ([]structs.Talk, error) { var talks []structs.Talk +<<<<<<< HEAD + err := db.Model(&talks).Order("date ASC").Where("date > ?", time.Now()).Limit(3).Select() +======= err := db.Model(&talks).Order("id DESC").Limit(3).Select() +>>>>>>> refs/remotes/origin/master if err != nil { return []structs.Talk{}, fmt.Errorf("could not get the talks from the db: %s", err) } @@ -32,7 +40,33 @@ func UpcomingTalksLimited(db *pg.DB) ([]structs.Talk, error) { // UpcomingTalks returns the next upcoming talks func UpcomingTalks(db *pg.DB) ([]structs.Talk, error) { var talks []structs.Talk +<<<<<<< HEAD + err := db.Model(&talks).Order("date ASC").Where("date > ?", time.Now()).Select() + if err != nil { + return []structs.Talk{}, fmt.Errorf("could not get the talks from the db: %s", err) + } + + return talks, nil +} + +// PastTalksLimited returns the past 3 talks +func PastTalksLimited(db *pg.DB) ([]structs.Talk, error) { + var talks []structs.Talk + err := db.Model(&talks).Order("date DESC").Where("date < ?", time.Now()).Limit(3).Select() + if err != nil { + return []structs.Talk{}, fmt.Errorf("could not get the talks from the db: %s", err) + } + + return talks, nil +} + +// PastTalks returns the next upcoming talks +func PastTalks(db *pg.DB) ([]structs.Talk, error) { + var talks []structs.Talk + err := db.Model(&talks).Order("date DESC").Where("date < ?", time.Now()).Select() +======= err := db.Model(&talks).Order("id DESC").Select() +>>>>>>> refs/remotes/origin/master if err != nil { return []structs.Talk{}, fmt.Errorf("could not get the talks from the db: %s", err) } @@ -42,9 +76,25 @@ func UpcomingTalks(db *pg.DB) ([]structs.Talk, error) { // CountUpcomingTalks counts the amount of talks upcoming func CountUpcomingTalks(db *pg.DB) (int, error) { +<<<<<<< HEAD + var talks []structs.Talk + count, err := db.Model(&talks).Where("date > ?", time.Now()).Where("upcoming = ?", true).SelectAndCount() + if err != nil { + return -1, fmt.Errorf("could not get the talks from the db: %s", err) + } + + return count, nil +} + +// CountPastTalks counts the amount of past talks +func CountPastTalks(db *pg.DB) (int, error) { + var talks []structs.Talk + count, err := db.Model(&talks).Where("date < ?", time.Now()).SelectAndCount() +======= var talks []structs.Talk count, err := db.Model(&talks).Where("upcoming = ?", true).SelectAndCount() +>>>>>>> refs/remotes/origin/master if err != nil { return -1, fmt.Errorf("could not get the talks from the db: %s", err) } |