From e5316da76b68ba5d48feaf4faa48ef85df684fd4 Mon Sep 17 00:00:00 2001 From: Karakoc Date: Fri, 29 Nov 2024 15:27:38 +0100 Subject: [PATCH 01/22] Try1 --- web/template/index.gohtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/index.gohtml b/web/template/index.gohtml index b5cdb91f6..9bd9b2caf 100644 --- a/web/template/index.gohtml +++ b/web/template/index.gohtml @@ -27,7 +27,7 @@ {{if .PinnedCourses}}

Pinned Courses

{{range $course := .PinnedCourses}} - {{if not $course.IsHidden}} + {{if $user.IsEligibleToWatchCourse $course}} {{template "course-card" (dict "course" $course "user" $user)}} {{end}} {{end}} From 04f8deb0fd455decb712ba76ec7449c970d9de42 Mon Sep 17 00:00:00 2001 From: Joscha Henningsen Date: Fri, 29 Nov 2024 16:28:13 +0100 Subject: [PATCH 02/22] fix(pinned-courses): add Database query to explicitly check for enrollement on all pinned courses --- .idea/dataSources.xml | 13 +++++++++---- api/courses.go | 9 +++++++++ cmd/tumlive/tumlive.go | 2 +- dao/courses.go | 11 +++++++++++ docker-compose.yml | 2 ++ go.work.sum | 17 +++++++++++++++++ web/template/home.gohtml | 1 + 7 files changed, 50 insertions(+), 5 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index efad91baa..4b32d5952 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -2,11 +2,16 @@ - mysql + mariadb true - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/tumlive + org.mariadb.jdbc.Driver + jdbc:mariadb://localhost:3306/tumlive + + + + + $ProjectFileDir$ - + \ No newline at end of file diff --git a/api/courses.go b/api/courses.go index 4b2c6c4a9..2ed826568 100644 --- a/api/courses.go +++ b/api/courses.go @@ -286,6 +286,15 @@ func (r coursesRoutes) getPinned(c *gin.Context) { user := tumLiveContext.User resp := make([]model.CourseDTO, 0, len(pinnedCourses)) for _, course := range pinnedCourses { + // todo: check if user is allowed to see the course + // -> Get full course from database + enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) + if err != nil { + enrolled = false + } + if course.Visibility == "enrolled" && !enrolled { + continue + } if !course.IsHidden() { resp = append(resp, course.ToDTO(user)) } diff --git a/cmd/tumlive/tumlive.go b/cmd/tumlive/tumlive.go index 82175b75d..a9c9bc725 100755 --- a/cmd/tumlive/tumlive.go +++ b/cmd/tumlive/tumlive.go @@ -83,7 +83,7 @@ func GinServer() (err error) { router.Use(gzip.Gzip(gzip.DefaultCompression)) api.ConfigGinRouter(router) web.ConfigGinRouter(router) - err = router.Run(":8081") + err = router.Run(":8083") // err = router.RunTLS(":443", tools.Cfg.Saml.Cert, tools.Cfg.Saml.Privkey) if err != nil { sentry.CaptureException(err) diff --git a/dao/courses.go b/dao/courses.go index 18f910b44..9ccb9c2f3 100644 --- a/dao/courses.go +++ b/dao/courses.go @@ -44,6 +44,8 @@ type CoursesDao interface { RemoveAdminFromCourse(userID uint, courseID uint) error DeleteCourse(course model.Course) + + IsUserEnrolledInCourse(userID uint, courseID uint) (bool, error) } type coursesDao struct { @@ -338,3 +340,12 @@ func (d coursesDao) DeleteCourse(course model.Course) { logger.Error("Can't delete course", "err", err) } } + +func (d coursesDao) IsUserEnrolledInCourse(user uint, course uint) (bool, error) { + var nRows int64 + err := DB.Table("course_users").Where("user_id = ? AND course_id = ?", user, course).Count(&nRows).Error + if err != nil { + return false, err + } + return nRows == 1, nil +} diff --git a/docker-compose.yml b/docker-compose.yml index fa7b8024f..3f47092f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,6 +71,8 @@ services: - ./init.sql:/data/application/init.sql - mariadb-data:/var/lib/mysql restart: always + ports: + - "3306:3306" # Omitted for local development due to size. Comment out to use voice-service # voice-service: # container_name: tum-live-voice-service diff --git a/go.work.sum b/go.work.sum index a86b78d80..0408042be 100644 --- a/go.work.sum +++ b/go.work.sum @@ -277,6 +277,7 @@ github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWr github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss= github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU= @@ -348,6 +349,7 @@ github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= @@ -373,6 +375,7 @@ github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/K github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM= @@ -488,6 +491,7 @@ github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNf github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 h1:JAEbJn3j/FrhdWA9jW8B5ajsLIjeuEHLi8xE4fk997o= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mediocregopher/radix/v3 v3.8.0 h1:HI8EgkaM7WzsrFpYAkOXIgUKbjNonb2Ne7K6Le61Pmg= @@ -565,12 +569,14 @@ github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN2 github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tdewolff/minify/v2 v2.12.4 h1:kejsHQMM17n6/gwdw53qsi6lg0TGddZADVyQOz1KMdE= github.com/tdewolff/parse/v2 v2.6.4 h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ= github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP3MV19m1gvndjUb1sn8yy74LM= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= +github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= @@ -632,6 +638,7 @@ go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95a go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= @@ -646,14 +653,17 @@ golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= @@ -671,13 +681,18 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -688,6 +703,7 @@ golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= @@ -728,6 +744,7 @@ google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQf google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/web/template/home.gohtml b/web/template/home.gohtml index 2ddccc456..7d6a8d8eb 100755 --- a/web/template/home.gohtml +++ b/web/template/home.gohtml @@ -13,6 +13,7 @@ {{if and .VersionTag (eq .VersionTag "development")}} + {{else}} {{end}} From 6d897bfa01b6fc9cb84a26f69e9e6ab4724a635e Mon Sep 17 00:00:00 2001 From: Karakoc Date: Fri, 29 Nov 2024 16:29:50 +0100 Subject: [PATCH 03/22] Try2 --- docker-compose.yml | 2 ++ go.work.sum | 17 ----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3f47092f5..478ce378b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,6 +62,8 @@ services: db: container_name: mariadb_container image: mariadb + ports: + - "3306:3306" environment: MYSQL_ROOT_USER: root MYSQL_ROOT_PASSWORD: example diff --git a/go.work.sum b/go.work.sum index 0408042be..a86b78d80 100644 --- a/go.work.sum +++ b/go.work.sum @@ -277,7 +277,6 @@ github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWr github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss= github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU= @@ -349,7 +348,6 @@ github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= @@ -375,7 +373,6 @@ github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/K github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM= @@ -491,7 +488,6 @@ github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNf github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 h1:JAEbJn3j/FrhdWA9jW8B5ajsLIjeuEHLi8xE4fk997o= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mediocregopher/radix/v3 v3.8.0 h1:HI8EgkaM7WzsrFpYAkOXIgUKbjNonb2Ne7K6Le61Pmg= @@ -569,14 +565,12 @@ github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN2 github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tdewolff/minify/v2 v2.12.4 h1:kejsHQMM17n6/gwdw53qsi6lg0TGddZADVyQOz1KMdE= github.com/tdewolff/parse/v2 v2.6.4 h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ= github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP3MV19m1gvndjUb1sn8yy74LM= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= @@ -638,7 +632,6 @@ go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95a go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= @@ -653,17 +646,14 @@ golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= @@ -681,18 +671,13 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -703,7 +688,6 @@ golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= @@ -744,7 +728,6 @@ google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQf google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= From dc60bcc1c7238d2f70598744decbc74893d11c80 Mon Sep 17 00:00:00 2001 From: Karakoc Date: Fri, 29 Nov 2024 16:45:57 +0100 Subject: [PATCH 04/22] SSH test --- Dockerfile (copy) | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Dockerfile (copy) diff --git a/Dockerfile (copy) b/Dockerfile (copy) new file mode 100644 index 000000000..fa47807a8 --- /dev/null +++ b/Dockerfile (copy) @@ -0,0 +1,35 @@ +FROM node:20 as node + +WORKDIR /app +COPY web web + +## remove generated files in case the developer build with npm before +RUN rm -rf web/assets/ts-dist &&\ + rm -rf web/assets/css-dist + +WORKDIR /app/web +RUN npm i --no-dev + +FROM golang:1.21-alpine3.18 as build-env + +RUN mkdir /gostuff +WORKDIR /gostuff +COPY go.mod go.sum ./ + +# Get dependencies - will also be cached if we won't change mod/sum +RUN go mod download + +WORKDIR /go/src/app +COPY . . +COPY --from=node /app/web/assets ./web/assets +COPY --from=node /app/web/node_modules ./web/node_modules + +# bundle version into binary if specified in build-args, dev otherwise. +ARG version=dev +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-w -extldflags '-static' -X main.VersionTag=${version}" -o /go/bin/tumlive cmd/tumlive/tumlive.go + +FROM alpine:3.18 +RUN apk add --no-cache tzdata openssl +WORKDIR /app +COPY --from=build-env /go/bin/tumlive . +CMD ["sh", "-c", "sleep 3 && ./tumlive"] From 606940deb393e4e3ed71d00f87c1f1469ccc1332 Mon Sep 17 00:00:00 2001 From: Karakoc Date: Fri, 29 Nov 2024 16:49:00 +0100 Subject: [PATCH 05/22] SSH test --- Dockerfile (copy) | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 Dockerfile (copy) diff --git a/Dockerfile (copy) b/Dockerfile (copy) deleted file mode 100644 index fa47807a8..000000000 --- a/Dockerfile (copy) +++ /dev/null @@ -1,35 +0,0 @@ -FROM node:20 as node - -WORKDIR /app -COPY web web - -## remove generated files in case the developer build with npm before -RUN rm -rf web/assets/ts-dist &&\ - rm -rf web/assets/css-dist - -WORKDIR /app/web -RUN npm i --no-dev - -FROM golang:1.21-alpine3.18 as build-env - -RUN mkdir /gostuff -WORKDIR /gostuff -COPY go.mod go.sum ./ - -# Get dependencies - will also be cached if we won't change mod/sum -RUN go mod download - -WORKDIR /go/src/app -COPY . . -COPY --from=node /app/web/assets ./web/assets -COPY --from=node /app/web/node_modules ./web/node_modules - -# bundle version into binary if specified in build-args, dev otherwise. -ARG version=dev -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-w -extldflags '-static' -X main.VersionTag=${version}" -o /go/bin/tumlive cmd/tumlive/tumlive.go - -FROM alpine:3.18 -RUN apk add --no-cache tzdata openssl -WORKDIR /app -COPY --from=build-env /go/bin/tumlive . -CMD ["sh", "-c", "sleep 3 && ./tumlive"] From 5821e4a1cd67ea70d38a7e5d05b60cb8e3934875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Wed, 4 Dec 2024 02:07:39 +0100 Subject: [PATCH 06/22] Update docker-compose.yml Merge error fixed --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 478ce378b..726920cfd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,8 +73,6 @@ services: - ./init.sql:/data/application/init.sql - mariadb-data:/var/lib/mysql restart: always - ports: - - "3306:3306" # Omitted for local development due to size. Comment out to use voice-service # voice-service: # container_name: tum-live-voice-service From 68ce13adbcb00bdacfdf21cb0a971d4fd55f79fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Wed, 4 Dec 2024 02:12:43 +0100 Subject: [PATCH 07/22] Update docker-compose.yml --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 726920cfd..fa7b8024f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,8 +62,6 @@ services: db: container_name: mariadb_container image: mariadb - ports: - - "3306:3306" environment: MYSQL_ROOT_USER: root MYSQL_ROOT_PASSWORD: example From a796b6aa006acbe2c9a057f4be79c67f293fa2ce Mon Sep 17 00:00:00 2001 From: Karakoc Date: Wed, 4 Dec 2024 21:41:08 +0100 Subject: [PATCH 08/22] Files reverted --- .idea/dataSources.xml | 13 ++++--------- cmd/tumlive/tumlive.go | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 4b32d5952..efad91baa 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -2,16 +2,11 @@ - mariadb + mysql true - org.mariadb.jdbc.Driver - jdbc:mariadb://localhost:3306/tumlive - - - - - + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/tumlive $ProjectFileDir$ - \ No newline at end of file + diff --git a/cmd/tumlive/tumlive.go b/cmd/tumlive/tumlive.go index a9c9bc725..82175b75d 100755 --- a/cmd/tumlive/tumlive.go +++ b/cmd/tumlive/tumlive.go @@ -83,7 +83,7 @@ func GinServer() (err error) { router.Use(gzip.Gzip(gzip.DefaultCompression)) api.ConfigGinRouter(router) web.ConfigGinRouter(router) - err = router.Run(":8083") + err = router.Run(":8081") // err = router.RunTLS(":443", tools.Cfg.Saml.Cert, tools.Cfg.Saml.Privkey) if err != nil { sentry.CaptureException(err) From 5e9b9480b4bae62047f92230c77d5956e579c15d Mon Sep 17 00:00:00 2001 From: Karakoc Date: Thu, 5 Dec 2024 18:50:06 +0100 Subject: [PATCH 09/22] Mockgen --- mock_dao/courses.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mock_dao/courses.go b/mock_dao/courses.go index 5700234b1..020fc8c43 100644 --- a/mock_dao/courses.go +++ b/mock_dao/courses.go @@ -310,6 +310,21 @@ func (mr *MockCoursesDaoMockRecorder) GetPublicCourses(year, term interface{}) * return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicCourses", reflect.TypeOf((*MockCoursesDao)(nil).GetPublicCourses), year, term) } +// IsUserEnrolledInCourse mocks base method. +func (m *MockCoursesDao) IsUserEnrolledInCourse(userID, courseID uint) (bool, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "IsUserEnrolledInCourse", userID, courseID) + ret0, _ := ret[0].(bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// IsUserEnrolledInCourse indicates an expected call of IsUserEnrolledInCourse. +func (mr *MockCoursesDaoMockRecorder) IsUserEnrolledInCourse(userID, courseID interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsUserEnrolledInCourse", reflect.TypeOf((*MockCoursesDao)(nil).IsUserEnrolledInCourse), userID, courseID) +} + // RemoveAdminFromCourse mocks base method. func (m *MockCoursesDao) RemoveAdminFromCourse(userID, courseID uint) error { m.ctrl.T.Helper() From 712dd90c3b7b077498c957164e003f2e1b4f8c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:12:54 +0100 Subject: [PATCH 10/22] Update course.go to prevent user being nil --- api/courses.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/api/courses.go b/api/courses.go index 2ed826568..fde4b654d 100644 --- a/api/courses.go +++ b/api/courses.go @@ -286,12 +286,17 @@ func (r coursesRoutes) getPinned(c *gin.Context) { user := tumLiveContext.User resp := make([]model.CourseDTO, 0, len(pinnedCourses)) for _, course := range pinnedCourses { - // todo: check if user is allowed to see the course - // -> Get full course from database - enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) - if err != nil { - enrolled = false + enrolled := false + if user != nil { + var err error + // todo: check if user is allowed to see the course + // -> Get full course from database + enrolled, err = r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) + if err != nil { + enrolled = false + } } + if course.Visibility == "enrolled" && !enrolled { continue } From 6514507d098ee59c0a9f4560e574512454fa7265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:02:07 +0100 Subject: [PATCH 11/22] Revert courses.go --- api/courses.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/api/courses.go b/api/courses.go index fde4b654d..2ed826568 100644 --- a/api/courses.go +++ b/api/courses.go @@ -286,17 +286,12 @@ func (r coursesRoutes) getPinned(c *gin.Context) { user := tumLiveContext.User resp := make([]model.CourseDTO, 0, len(pinnedCourses)) for _, course := range pinnedCourses { - enrolled := false - if user != nil { - var err error - // todo: check if user is allowed to see the course - // -> Get full course from database - enrolled, err = r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) - if err != nil { - enrolled = false - } + // todo: check if user is allowed to see the course + // -> Get full course from database + enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) + if err != nil { + enrolled = false } - if course.Visibility == "enrolled" && !enrolled { continue } From 236d56414e38207697e17ef7e9cfa8ea422d90dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:08:24 +0100 Subject: [PATCH 12/22] Update courses.go --- api/courses.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/courses.go b/api/courses.go index 2ed826568..68c2bd24d 100644 --- a/api/courses.go +++ b/api/courses.go @@ -288,10 +288,10 @@ func (r coursesRoutes) getPinned(c *gin.Context) { for _, course := range pinnedCourses { // todo: check if user is allowed to see the course // -> Get full course from database - enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) - if err != nil { - enrolled = false - } + //enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) + //if err != nil { + //enrolled = false + //} if course.Visibility == "enrolled" && !enrolled { continue } From f9108534790d713344dcacf33bbe61a3de672aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:12:15 +0100 Subject: [PATCH 13/22] Update courses.go --- api/courses.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/api/courses.go b/api/courses.go index 68c2bd24d..9dc38251c 100644 --- a/api/courses.go +++ b/api/courses.go @@ -288,10 +288,12 @@ func (r coursesRoutes) getPinned(c *gin.Context) { for _, course := range pinnedCourses { // todo: check if user is allowed to see the course // -> Get full course from database - //enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) - //if err != nil { - //enrolled = false - //} + if tumLiveContext.User != nil { + enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) + if err != nil { + enrolled = false + } + } if course.Visibility == "enrolled" && !enrolled { continue } From 667e5f44437db487d53c4120c48bbafd949f4677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:18:12 +0100 Subject: [PATCH 14/22] Update courses.go --- api/courses.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/courses.go b/api/courses.go index 9dc38251c..6fb849f09 100644 --- a/api/courses.go +++ b/api/courses.go @@ -286,10 +286,12 @@ func (r coursesRoutes) getPinned(c *gin.Context) { user := tumLiveContext.User resp := make([]model.CourseDTO, 0, len(pinnedCourses)) for _, course := range pinnedCourses { + enrolled := false + var err error // todo: check if user is allowed to see the course // -> Get full course from database if tumLiveContext.User != nil { - enrolled, err := r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) + enrolled, err = r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) if err != nil { enrolled = false } From b88438d2420481a6bc9391a5a1cf2fa1e362fd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:31:06 +0100 Subject: [PATCH 15/22] Update courses.go --- api/courses.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/courses.go b/api/courses.go index 6fb849f09..6861d14dd 100644 --- a/api/courses.go +++ b/api/courses.go @@ -290,7 +290,7 @@ func (r coursesRoutes) getPinned(c *gin.Context) { var err error // todo: check if user is allowed to see the course // -> Get full course from database - if tumLiveContext.User != nil { + if tumLiveContext.User != nil && course != nil { enrolled, err = r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) if err != nil { enrolled = false From 4dd220d0436cbb63a46fd5ed6d1ed146131f187f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:33:45 +0100 Subject: [PATCH 16/22] Update courses.go --- api/courses.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/courses.go b/api/courses.go index 6861d14dd..6fb849f09 100644 --- a/api/courses.go +++ b/api/courses.go @@ -290,7 +290,7 @@ func (r coursesRoutes) getPinned(c *gin.Context) { var err error // todo: check if user is allowed to see the course // -> Get full course from database - if tumLiveContext.User != nil && course != nil { + if tumLiveContext.User != nil { enrolled, err = r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) if err != nil { enrolled = false From c75cf8fb04263621c4359eb4e3dd0bc4f608f3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:54:28 +0100 Subject: [PATCH 17/22] Update courses.go --- api/courses.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/courses.go b/api/courses.go index 6fb849f09..108ea0b53 100644 --- a/api/courses.go +++ b/api/courses.go @@ -290,8 +290,8 @@ func (r coursesRoutes) getPinned(c *gin.Context) { var err error // todo: check if user is allowed to see the course // -> Get full course from database - if tumLiveContext.User != nil { - enrolled, err = r.CoursesDao.IsUserEnrolledInCourse(tumLiveContext.User.ID, course.ID) + if user != nil { + enrolled, err = r.CoursesDao.IsUserEnrolledInCourse(user.ID, course.ID) if err != nil { enrolled = false } From e1107d2dbf32012a862431c1d920fae7c45a1ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:14:41 +0100 Subject: [PATCH 18/22] Update courses.go --- dao/courses.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dao/courses.go b/dao/courses.go index 9ccb9c2f3..afec2a770 100644 --- a/dao/courses.go +++ b/dao/courses.go @@ -343,7 +343,11 @@ func (d coursesDao) DeleteCourse(course model.Course) { func (d coursesDao) IsUserEnrolledInCourse(user uint, course uint) (bool, error) { var nRows int64 - err := DB.Table("course_users").Where("user_id = ? AND course_id = ?", user, course).Count(&nRows).Error + var err error + if DB == nil { + return false, err + } + err = DB.Table("course_users").Where("user_id = ? AND course_id = ?", user, course).Count(&nRows).Error if err != nil { return false, err } From 750d8e40c45808851d6ad998328cf27c48970e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:20:34 +0100 Subject: [PATCH 19/22] Revert courses.go --- dao/courses.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dao/courses.go b/dao/courses.go index afec2a770..73238727a 100644 --- a/dao/courses.go +++ b/dao/courses.go @@ -344,10 +344,7 @@ func (d coursesDao) DeleteCourse(course model.Course) { func (d coursesDao) IsUserEnrolledInCourse(user uint, course uint) (bool, error) { var nRows int64 var err error - if DB == nil { - return false, err - } - err = DB.Table("course_users").Where("user_id = ? AND course_id = ?", user, course).Count(&nRows).Error + err := DB.Table("course_users").Where("user_id = ? AND course_id = ?", user, course).Count(&nRows).Error if err != nil { return false, err } From d7482d9cc380ac52d2d17aee6dbd295e29dba71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kemal=20Karako=C3=A7?= <42945832+KemalKrKX@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:24:28 +0100 Subject: [PATCH 20/22] Update courses.go --- dao/courses.go | 1 - 1 file changed, 1 deletion(-) diff --git a/dao/courses.go b/dao/courses.go index 73238727a..9ccb9c2f3 100644 --- a/dao/courses.go +++ b/dao/courses.go @@ -343,7 +343,6 @@ func (d coursesDao) DeleteCourse(course model.Course) { func (d coursesDao) IsUserEnrolledInCourse(user uint, course uint) (bool, error) { var nRows int64 - var err error err := DB.Table("course_users").Where("user_id = ? AND course_id = ?", user, course).Count(&nRows).Error if err != nil { return false, err From 2dd9edeed55e3ff8119fc8dc0db0d7ab5a95d386 Mon Sep 17 00:00:00 2001 From: Joscha Henningsen Date: Fri, 10 Jan 2025 15:44:12 +0100 Subject: [PATCH 21/22] chore: remake mocks --- go.work.sum | 13 +++++ mock_dao/audit.go | 16 ++++-- mock_dao/bookmark.go | 18 ++++--- mock_dao/camera-preset.go | 10 +++- mock_dao/chat.go | 48 ++++++++++-------- mock_dao/courses.go | 54 +++++++++++--------- mock_dao/email.go | 20 +++++--- mock_dao/file.go | 18 ++++--- mock_dao/info-page.go | 14 ++++-- mock_dao/ingest_server.go | 18 ++++--- mock_dao/lecture_halls.go | 28 ++++++----- mock_dao/notifications.go | 16 ++++-- mock_dao/progress.go | 16 ++++-- mock_dao/server-notification.go | 14 ++++-- mock_dao/statistics.go | 7 +-- mock_dao/streams.go | 84 +++++++++++++++++--------------- mock_dao/subtitles.go | 18 ++++--- mock_dao/token.go | 20 +++++--- mock_dao/transcoding-failure.go | 12 +++-- mock_dao/upload_key.go | 14 ++++-- mock_dao/users.go | 42 +++++++++------- mock_dao/video-section.go | 18 ++++--- mock_dao/video-seek.go | 12 +++-- mock_dao/worker.go | 18 ++++--- mock_tools/meiliSearch.go | 22 ++++++--- mock_tools/mock_camera/camera.go | 12 +++-- mock_tools/presets.go | 18 ++++--- 27 files changed, 382 insertions(+), 218 deletions(-) diff --git a/go.work.sum b/go.work.sum index a86b78d80..aef7c4a00 100644 --- a/go.work.sum +++ b/go.work.sum @@ -277,6 +277,7 @@ github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWr github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss= github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU= @@ -348,6 +349,7 @@ github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= @@ -373,6 +375,7 @@ github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/K github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM= @@ -488,6 +491,7 @@ github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNf github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 h1:JAEbJn3j/FrhdWA9jW8B5ajsLIjeuEHLi8xE4fk997o= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mediocregopher/radix/v3 v3.8.0 h1:HI8EgkaM7WzsrFpYAkOXIgUKbjNonb2Ne7K6Le61Pmg= @@ -565,12 +569,14 @@ github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN2 github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tdewolff/minify/v2 v2.12.4 h1:kejsHQMM17n6/gwdw53qsi6lg0TGddZADVyQOz1KMdE= github.com/tdewolff/parse/v2 v2.6.4 h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ= github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP3MV19m1gvndjUb1sn8yy74LM= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= +github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= @@ -632,6 +638,7 @@ go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95a go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= @@ -648,12 +655,14 @@ golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= @@ -677,7 +686,10 @@ golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -728,6 +740,7 @@ google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQf google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/mock_dao/audit.go b/mock_dao/audit.go index ee55e78f2..7a896ef68 100644 --- a/mock_dao/audit.go +++ b/mock_dao/audit.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: audit.go +// +// Generated by this command: +// +// mockgen -source=audit.go -destination ../mock_dao/audit.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockAuditDao is a mock of AuditDao interface. type MockAuditDao struct { ctrl *gomock.Controller recorder *MockAuditDaoMockRecorder + isgomock struct{} } // MockAuditDaoMockRecorder is the mock recorder for MockAuditDao. @@ -43,7 +49,7 @@ func (m *MockAuditDao) Create(arg0 *model.Audit) error { } // Create indicates an expected call of Create. -func (mr *MockAuditDaoMockRecorder) Create(arg0 interface{}) *gomock.Call { +func (mr *MockAuditDaoMockRecorder) Create(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockAuditDao)(nil).Create), arg0) } @@ -51,7 +57,7 @@ func (mr *MockAuditDaoMockRecorder) Create(arg0 interface{}) *gomock.Call { // Find mocks base method. func (m *MockAuditDao) Find(limit, offset int, types ...model.AuditType) ([]model.Audit, error) { m.ctrl.T.Helper() - varargs := []interface{}{limit, offset} + varargs := []any{limit, offset} for _, a := range types { varargs = append(varargs, a) } @@ -62,8 +68,8 @@ func (m *MockAuditDao) Find(limit, offset int, types ...model.AuditType) ([]mode } // Find indicates an expected call of Find. -func (mr *MockAuditDaoMockRecorder) Find(limit, offset interface{}, types ...interface{}) *gomock.Call { +func (mr *MockAuditDaoMockRecorder) Find(limit, offset any, types ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{limit, offset}, types...) + varargs := append([]any{limit, offset}, types...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockAuditDao)(nil).Find), varargs...) } diff --git a/mock_dao/bookmark.go b/mock_dao/bookmark.go index 921c2626b..38c2c64f8 100644 --- a/mock_dao/bookmark.go +++ b/mock_dao/bookmark.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: bookmark.go +// +// Generated by this command: +// +// mockgen -source=bookmark.go -destination ../mock_dao/bookmark.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockBookmarkDao is a mock of BookmarkDao interface. type MockBookmarkDao struct { ctrl *gomock.Controller recorder *MockBookmarkDaoMockRecorder + isgomock struct{} } // MockBookmarkDaoMockRecorder is the mock recorder for MockBookmarkDao. @@ -43,7 +49,7 @@ func (m *MockBookmarkDao) Add(arg0 *model.Bookmark) error { } // Add indicates an expected call of Add. -func (mr *MockBookmarkDaoMockRecorder) Add(arg0 interface{}) *gomock.Call { +func (mr *MockBookmarkDaoMockRecorder) Add(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockBookmarkDao)(nil).Add), arg0) } @@ -57,7 +63,7 @@ func (m *MockBookmarkDao) Delete(arg0 uint) error { } // Delete indicates an expected call of Delete. -func (mr *MockBookmarkDaoMockRecorder) Delete(arg0 interface{}) *gomock.Call { +func (mr *MockBookmarkDaoMockRecorder) Delete(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockBookmarkDao)(nil).Delete), arg0) } @@ -72,7 +78,7 @@ func (m *MockBookmarkDao) GetByID(arg0 uint) (model.Bookmark, error) { } // GetByID indicates an expected call of GetByID. -func (mr *MockBookmarkDaoMockRecorder) GetByID(arg0 interface{}) *gomock.Call { +func (mr *MockBookmarkDaoMockRecorder) GetByID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByID", reflect.TypeOf((*MockBookmarkDao)(nil).GetByID), arg0) } @@ -87,7 +93,7 @@ func (m *MockBookmarkDao) GetByStreamID(arg0, arg1 uint) ([]model.Bookmark, erro } // GetByStreamID indicates an expected call of GetByStreamID. -func (mr *MockBookmarkDaoMockRecorder) GetByStreamID(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockBookmarkDaoMockRecorder) GetByStreamID(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByStreamID", reflect.TypeOf((*MockBookmarkDao)(nil).GetByStreamID), arg0, arg1) } @@ -101,7 +107,7 @@ func (m *MockBookmarkDao) Update(arg0 *model.Bookmark) error { } // Update indicates an expected call of Update. -func (mr *MockBookmarkDaoMockRecorder) Update(arg0 interface{}) *gomock.Call { +func (mr *MockBookmarkDaoMockRecorder) Update(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockBookmarkDao)(nil).Update), arg0) } diff --git a/mock_dao/camera-preset.go b/mock_dao/camera-preset.go index f6dc6a44e..5d1a24c6c 100644 --- a/mock_dao/camera-preset.go +++ b/mock_dao/camera-preset.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: camera-preset.go +// +// Generated by this command: +// +// mockgen -source=camera-preset.go -destination ../mock_dao/camera-preset.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockCameraPresetDao is a mock of CameraPresetDao interface. type MockCameraPresetDao struct { ctrl *gomock.Controller recorder *MockCameraPresetDaoMockRecorder + isgomock struct{} } // MockCameraPresetDaoMockRecorder is the mock recorder for MockCameraPresetDao. @@ -44,7 +50,7 @@ func (m *MockCameraPresetDao) GetDefaultCameraPreset(lectureHallID uint) (model. } // GetDefaultCameraPreset indicates an expected call of GetDefaultCameraPreset. -func (mr *MockCameraPresetDaoMockRecorder) GetDefaultCameraPreset(lectureHallID interface{}) *gomock.Call { +func (mr *MockCameraPresetDaoMockRecorder) GetDefaultCameraPreset(lectureHallID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDefaultCameraPreset", reflect.TypeOf((*MockCameraPresetDao)(nil).GetDefaultCameraPreset), lectureHallID) } diff --git a/mock_dao/chat.go b/mock_dao/chat.go index d6d17ec08..60d7e0f02 100644 --- a/mock_dao/chat.go +++ b/mock_dao/chat.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: chat.go +// +// Generated by this command: +// +// mockgen -source=chat.go -destination ../mock_dao/chat.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockChatDao is a mock of ChatDao interface. type MockChatDao struct { ctrl *gomock.Controller recorder *MockChatDaoMockRecorder + isgomock struct{} } // MockChatDaoMockRecorder is the mock recorder for MockChatDao. @@ -43,7 +49,7 @@ func (m *MockChatDao) AddChatPoll(poll *model.Poll) error { } // AddChatPoll indicates an expected call of AddChatPoll. -func (mr *MockChatDaoMockRecorder) AddChatPoll(poll interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) AddChatPoll(poll any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddChatPoll", reflect.TypeOf((*MockChatDao)(nil).AddChatPoll), poll) } @@ -57,7 +63,7 @@ func (m *MockChatDao) AddChatPollOptionVote(pollOptionId, userId uint) error { } // AddChatPollOptionVote indicates an expected call of AddChatPollOptionVote. -func (mr *MockChatDaoMockRecorder) AddChatPollOptionVote(pollOptionId, userId interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) AddChatPollOptionVote(pollOptionId, userId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddChatPollOptionVote", reflect.TypeOf((*MockChatDao)(nil).AddChatPollOptionVote), pollOptionId, userId) } @@ -71,7 +77,7 @@ func (m *MockChatDao) AddMessage(chat *model.Chat) error { } // AddMessage indicates an expected call of AddMessage. -func (mr *MockChatDaoMockRecorder) AddMessage(chat interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) AddMessage(chat any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddMessage", reflect.TypeOf((*MockChatDao)(nil).AddMessage), chat) } @@ -85,7 +91,7 @@ func (m *MockChatDao) ApproveChat(id uint) error { } // ApproveChat indicates an expected call of ApproveChat. -func (mr *MockChatDaoMockRecorder) ApproveChat(id interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) ApproveChat(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApproveChat", reflect.TypeOf((*MockChatDao)(nil).ApproveChat), id) } @@ -99,7 +105,7 @@ func (m *MockChatDao) CloseActivePoll(streamID uint) error { } // CloseActivePoll indicates an expected call of CloseActivePoll. -func (mr *MockChatDaoMockRecorder) CloseActivePoll(streamID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) CloseActivePoll(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseActivePoll", reflect.TypeOf((*MockChatDao)(nil).CloseActivePoll), streamID) } @@ -113,7 +119,7 @@ func (m *MockChatDao) DeleteChat(id uint) error { } // DeleteChat indicates an expected call of DeleteChat. -func (mr *MockChatDaoMockRecorder) DeleteChat(id interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) DeleteChat(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteChat", reflect.TypeOf((*MockChatDao)(nil).DeleteChat), id) } @@ -128,7 +134,7 @@ func (m *MockChatDao) GetActivePoll(streamID uint) (model.Poll, error) { } // GetActivePoll indicates an expected call of GetActivePoll. -func (mr *MockChatDaoMockRecorder) GetActivePoll(streamID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetActivePoll(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetActivePoll", reflect.TypeOf((*MockChatDao)(nil).GetActivePoll), streamID) } @@ -143,7 +149,7 @@ func (m *MockChatDao) GetAllChats(userID, streamID uint) ([]model.Chat, error) { } // GetAllChats indicates an expected call of GetAllChats. -func (mr *MockChatDaoMockRecorder) GetAllChats(userID, streamID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetAllChats(userID, streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllChats", reflect.TypeOf((*MockChatDao)(nil).GetAllChats), userID, streamID) } @@ -158,7 +164,7 @@ func (m *MockChatDao) GetChat(id, userID uint) (*model.Chat, error) { } // GetChat indicates an expected call of GetChat. -func (mr *MockChatDaoMockRecorder) GetChat(id, userID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetChat(id, userID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChat", reflect.TypeOf((*MockChatDao)(nil).GetChat), id, userID) } @@ -173,7 +179,7 @@ func (m *MockChatDao) GetChatUsers(streamid uint) ([]model.User, error) { } // GetChatUsers indicates an expected call of GetChatUsers. -func (mr *MockChatDaoMockRecorder) GetChatUsers(streamid interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetChatUsers(streamid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChatUsers", reflect.TypeOf((*MockChatDao)(nil).GetChatUsers), streamid) } @@ -188,7 +194,7 @@ func (m *MockChatDao) GetChatsByUser(userID uint) ([]model.Chat, error) { } // GetChatsByUser indicates an expected call of GetChatsByUser. -func (mr *MockChatDaoMockRecorder) GetChatsByUser(userID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetChatsByUser(userID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChatsByUser", reflect.TypeOf((*MockChatDao)(nil).GetChatsByUser), userID) } @@ -203,7 +209,7 @@ func (m *MockChatDao) GetPollOptionVoteCount(pollOptionId uint) (int64, error) { } // GetPollOptionVoteCount indicates an expected call of GetPollOptionVoteCount. -func (mr *MockChatDaoMockRecorder) GetPollOptionVoteCount(pollOptionId interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetPollOptionVoteCount(pollOptionId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPollOptionVoteCount", reflect.TypeOf((*MockChatDao)(nil).GetPollOptionVoteCount), pollOptionId) } @@ -218,7 +224,7 @@ func (m *MockChatDao) GetPollUserVote(pollId, userId uint) (uint, error) { } // GetPollUserVote indicates an expected call of GetPollUserVote. -func (mr *MockChatDaoMockRecorder) GetPollUserVote(pollId, userId interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetPollUserVote(pollId, userId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPollUserVote", reflect.TypeOf((*MockChatDao)(nil).GetPollUserVote), pollId, userId) } @@ -233,7 +239,7 @@ func (m *MockChatDao) GetPolls(streamID uint) ([]model.Poll, error) { } // GetPolls indicates an expected call of GetPolls. -func (mr *MockChatDaoMockRecorder) GetPolls(streamID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetPolls(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPolls", reflect.TypeOf((*MockChatDao)(nil).GetPolls), streamID) } @@ -248,7 +254,7 @@ func (m *MockChatDao) GetReactions(chatID uint) ([]model.ChatReaction, error) { } // GetReactions indicates an expected call of GetReactions. -func (mr *MockChatDaoMockRecorder) GetReactions(chatID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetReactions(chatID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetReactions", reflect.TypeOf((*MockChatDao)(nil).GetReactions), chatID) } @@ -263,7 +269,7 @@ func (m *MockChatDao) GetVisibleChats(userID, streamID uint) ([]model.Chat, erro } // GetVisibleChats indicates an expected call of GetVisibleChats. -func (mr *MockChatDaoMockRecorder) GetVisibleChats(userID, streamID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) GetVisibleChats(userID, streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVisibleChats", reflect.TypeOf((*MockChatDao)(nil).GetVisibleChats), userID, streamID) } @@ -277,7 +283,7 @@ func (m *MockChatDao) RemoveReactions(chatID uint) error { } // RemoveReactions indicates an expected call of RemoveReactions. -func (mr *MockChatDaoMockRecorder) RemoveReactions(chatID interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) RemoveReactions(chatID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveReactions", reflect.TypeOf((*MockChatDao)(nil).RemoveReactions), chatID) } @@ -291,7 +297,7 @@ func (m *MockChatDao) ResolveChat(id uint) error { } // ResolveChat indicates an expected call of ResolveChat. -func (mr *MockChatDaoMockRecorder) ResolveChat(id interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) ResolveChat(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResolveChat", reflect.TypeOf((*MockChatDao)(nil).ResolveChat), id) } @@ -305,7 +311,7 @@ func (m *MockChatDao) RetractChat(id uint) error { } // RetractChat indicates an expected call of RetractChat. -func (mr *MockChatDaoMockRecorder) RetractChat(id interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) RetractChat(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RetractChat", reflect.TypeOf((*MockChatDao)(nil).RetractChat), id) } @@ -319,7 +325,7 @@ func (m *MockChatDao) ToggleReaction(userID, chatID uint, username, emoji string } // ToggleReaction indicates an expected call of ToggleReaction. -func (mr *MockChatDaoMockRecorder) ToggleReaction(userID, chatID, username, emoji interface{}) *gomock.Call { +func (mr *MockChatDaoMockRecorder) ToggleReaction(userID, chatID, username, emoji any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleReaction", reflect.TypeOf((*MockChatDao)(nil).ToggleReaction), userID, chatID, username, emoji) } diff --git a/mock_dao/courses.go b/mock_dao/courses.go index 020fc8c43..5e030505c 100644 --- a/mock_dao/courses.go +++ b/mock_dao/courses.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: courses.go +// +// Generated by this command: +// +// mockgen -source=courses.go -destination ../mock_dao/courses.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -10,13 +15,14 @@ import ( dao "github.com/TUM-Dev/gocast/dao" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockCoursesDao is a mock of CoursesDao interface. type MockCoursesDao struct { ctrl *gomock.Controller recorder *MockCoursesDaoMockRecorder + isgomock struct{} } // MockCoursesDaoMockRecorder is the mock recorder for MockCoursesDao. @@ -45,7 +51,7 @@ func (m *MockCoursesDao) AddAdminToCourse(userID, courseID uint) error { } // AddAdminToCourse indicates an expected call of AddAdminToCourse. -func (mr *MockCoursesDaoMockRecorder) AddAdminToCourse(userID, courseID interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) AddAdminToCourse(userID, courseID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddAdminToCourse", reflect.TypeOf((*MockCoursesDao)(nil).AddAdminToCourse), userID, courseID) } @@ -59,7 +65,7 @@ func (m *MockCoursesDao) CreateCourse(ctx context.Context, course *model.Course, } // CreateCourse indicates an expected call of CreateCourse. -func (mr *MockCoursesDaoMockRecorder) CreateCourse(ctx, course, keep interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) CreateCourse(ctx, course, keep any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateCourse", reflect.TypeOf((*MockCoursesDao)(nil).CreateCourse), ctx, course, keep) } @@ -71,7 +77,7 @@ func (m *MockCoursesDao) DeleteCourse(course model.Course) { } // DeleteCourse indicates an expected call of DeleteCourse. -func (mr *MockCoursesDaoMockRecorder) DeleteCourse(course interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) DeleteCourse(course any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCourse", reflect.TypeOf((*MockCoursesDao)(nil).DeleteCourse), course) } @@ -83,7 +89,7 @@ func (m *MockCoursesDao) ExecAllCourses(f func([]dao.Course)) { } // ExecAllCourses indicates an expected call of ExecAllCourses. -func (mr *MockCoursesDaoMockRecorder) ExecAllCourses(f interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) ExecAllCourses(f any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecAllCourses", reflect.TypeOf((*MockCoursesDao)(nil).ExecAllCourses), f) } @@ -98,7 +104,7 @@ func (m *MockCoursesDao) GetAdministeredCoursesByUserId(ctx context.Context, use } // GetAdministeredCoursesByUserId indicates an expected call of GetAdministeredCoursesByUserId. -func (mr *MockCoursesDaoMockRecorder) GetAdministeredCoursesByUserId(ctx, userid, teachingTerm, year interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetAdministeredCoursesByUserId(ctx, userid, teachingTerm, year any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAdministeredCoursesByUserId", reflect.TypeOf((*MockCoursesDao)(nil).GetAdministeredCoursesByUserId), ctx, userid, teachingTerm, year) } @@ -127,7 +133,7 @@ func (m *MockCoursesDao) GetAllCoursesForSemester(year int, term string, ctx con } // GetAllCoursesForSemester indicates an expected call of GetAllCoursesForSemester. -func (mr *MockCoursesDaoMockRecorder) GetAllCoursesForSemester(year, term, ctx interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetAllCoursesForSemester(year, term, ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllCoursesForSemester", reflect.TypeOf((*MockCoursesDao)(nil).GetAllCoursesForSemester), year, term, ctx) } @@ -142,7 +148,7 @@ func (m *MockCoursesDao) GetAllCoursesWithTUMIDFromSemester(ctx context.Context, } // GetAllCoursesWithTUMIDFromSemester indicates an expected call of GetAllCoursesWithTUMIDFromSemester. -func (mr *MockCoursesDaoMockRecorder) GetAllCoursesWithTUMIDFromSemester(ctx, year, term interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetAllCoursesWithTUMIDFromSemester(ctx, year, term any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllCoursesWithTUMIDFromSemester", reflect.TypeOf((*MockCoursesDao)(nil).GetAllCoursesWithTUMIDFromSemester), ctx, year, term) } @@ -156,7 +162,7 @@ func (m *MockCoursesDao) GetAvailableSemesters(c context.Context) []model.Semest } // GetAvailableSemesters indicates an expected call of GetAvailableSemesters. -func (mr *MockCoursesDaoMockRecorder) GetAvailableSemesters(c interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetAvailableSemesters(c any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAvailableSemesters", reflect.TypeOf((*MockCoursesDao)(nil).GetAvailableSemesters), c) } @@ -171,7 +177,7 @@ func (m *MockCoursesDao) GetCourseAdmins(courseID uint) ([]model.User, error) { } // GetCourseAdmins indicates an expected call of GetCourseAdmins. -func (mr *MockCoursesDaoMockRecorder) GetCourseAdmins(courseID interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetCourseAdmins(courseID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCourseAdmins", reflect.TypeOf((*MockCoursesDao)(nil).GetCourseAdmins), courseID) } @@ -186,7 +192,7 @@ func (m *MockCoursesDao) GetCourseById(ctx context.Context, id uint) (model.Cour } // GetCourseById indicates an expected call of GetCourseById. -func (mr *MockCoursesDaoMockRecorder) GetCourseById(ctx, id interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetCourseById(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCourseById", reflect.TypeOf((*MockCoursesDao)(nil).GetCourseById), ctx, id) } @@ -201,7 +207,7 @@ func (m *MockCoursesDao) GetCourseByShortLink(link string) (model.Course, error) } // GetCourseByShortLink indicates an expected call of GetCourseByShortLink. -func (mr *MockCoursesDaoMockRecorder) GetCourseByShortLink(link interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetCourseByShortLink(link any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCourseByShortLink", reflect.TypeOf((*MockCoursesDao)(nil).GetCourseByShortLink), link) } @@ -216,7 +222,7 @@ func (m *MockCoursesDao) GetCourseBySlugYearAndTerm(ctx context.Context, slug, t } // GetCourseBySlugYearAndTerm indicates an expected call of GetCourseBySlugYearAndTerm. -func (mr *MockCoursesDaoMockRecorder) GetCourseBySlugYearAndTerm(ctx, slug, term, year interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetCourseBySlugYearAndTerm(ctx, slug, term, year any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCourseBySlugYearAndTerm", reflect.TypeOf((*MockCoursesDao)(nil).GetCourseBySlugYearAndTerm), ctx, slug, term, year) } @@ -231,7 +237,7 @@ func (m *MockCoursesDao) GetCourseByToken(token string) (model.Course, error) { } // GetCourseByToken indicates an expected call of GetCourseByToken. -func (mr *MockCoursesDaoMockRecorder) GetCourseByToken(token interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetCourseByToken(token any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCourseByToken", reflect.TypeOf((*MockCoursesDao)(nil).GetCourseByToken), token) } @@ -246,7 +252,7 @@ func (m *MockCoursesDao) GetCourseForLecturerIdByYearAndTerm(c context.Context, } // GetCourseForLecturerIdByYearAndTerm indicates an expected call of GetCourseForLecturerIdByYearAndTerm. -func (mr *MockCoursesDaoMockRecorder) GetCourseForLecturerIdByYearAndTerm(c, year, term, userId interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetCourseForLecturerIdByYearAndTerm(c, year, term, userId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCourseForLecturerIdByYearAndTerm", reflect.TypeOf((*MockCoursesDao)(nil).GetCourseForLecturerIdByYearAndTerm), c, year, term, userId) } @@ -261,7 +267,7 @@ func (m *MockCoursesDao) GetCurrentOrNextLectureForCourse(ctx context.Context, c } // GetCurrentOrNextLectureForCourse indicates an expected call of GetCurrentOrNextLectureForCourse. -func (mr *MockCoursesDaoMockRecorder) GetCurrentOrNextLectureForCourse(ctx, courseID interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetCurrentOrNextLectureForCourse(ctx, courseID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCurrentOrNextLectureForCourse", reflect.TypeOf((*MockCoursesDao)(nil).GetCurrentOrNextLectureForCourse), ctx, courseID) } @@ -275,7 +281,7 @@ func (m *MockCoursesDao) GetInvitedUsersForCourse(course *model.Course) error { } // GetInvitedUsersForCourse indicates an expected call of GetInvitedUsersForCourse. -func (mr *MockCoursesDaoMockRecorder) GetInvitedUsersForCourse(course interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetInvitedUsersForCourse(course any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInvitedUsersForCourse", reflect.TypeOf((*MockCoursesDao)(nil).GetInvitedUsersForCourse), course) } @@ -290,7 +296,7 @@ func (m *MockCoursesDao) GetPublicAndLoggedInCourses(year int, term string) ([]m } // GetPublicAndLoggedInCourses indicates an expected call of GetPublicAndLoggedInCourses. -func (mr *MockCoursesDaoMockRecorder) GetPublicAndLoggedInCourses(year, term interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetPublicAndLoggedInCourses(year, term any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicAndLoggedInCourses", reflect.TypeOf((*MockCoursesDao)(nil).GetPublicAndLoggedInCourses), year, term) } @@ -305,7 +311,7 @@ func (m *MockCoursesDao) GetPublicCourses(year int, term string) ([]model.Course } // GetPublicCourses indicates an expected call of GetPublicCourses. -func (mr *MockCoursesDaoMockRecorder) GetPublicCourses(year, term interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) GetPublicCourses(year, term any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicCourses", reflect.TypeOf((*MockCoursesDao)(nil).GetPublicCourses), year, term) } @@ -320,7 +326,7 @@ func (m *MockCoursesDao) IsUserEnrolledInCourse(userID, courseID uint) (bool, er } // IsUserEnrolledInCourse indicates an expected call of IsUserEnrolledInCourse. -func (mr *MockCoursesDaoMockRecorder) IsUserEnrolledInCourse(userID, courseID interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) IsUserEnrolledInCourse(userID, courseID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsUserEnrolledInCourse", reflect.TypeOf((*MockCoursesDao)(nil).IsUserEnrolledInCourse), userID, courseID) } @@ -334,7 +340,7 @@ func (m *MockCoursesDao) RemoveAdminFromCourse(userID, courseID uint) error { } // RemoveAdminFromCourse indicates an expected call of RemoveAdminFromCourse. -func (mr *MockCoursesDaoMockRecorder) RemoveAdminFromCourse(userID, courseID interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) RemoveAdminFromCourse(userID, courseID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveAdminFromCourse", reflect.TypeOf((*MockCoursesDao)(nil).RemoveAdminFromCourse), userID, courseID) } @@ -348,7 +354,7 @@ func (m *MockCoursesDao) UnDeleteCourse(ctx context.Context, course model.Course } // UnDeleteCourse indicates an expected call of UnDeleteCourse. -func (mr *MockCoursesDaoMockRecorder) UnDeleteCourse(ctx, course interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) UnDeleteCourse(ctx, course any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnDeleteCourse", reflect.TypeOf((*MockCoursesDao)(nil).UnDeleteCourse), ctx, course) } @@ -362,7 +368,7 @@ func (m *MockCoursesDao) UpdateCourse(ctx context.Context, course model.Course) } // UpdateCourse indicates an expected call of UpdateCourse. -func (mr *MockCoursesDaoMockRecorder) UpdateCourse(ctx, course interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) UpdateCourse(ctx, course any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateCourse", reflect.TypeOf((*MockCoursesDao)(nil).UpdateCourse), ctx, course) } @@ -374,7 +380,7 @@ func (m *MockCoursesDao) UpdateCourseMetadata(ctx context.Context, course model. } // UpdateCourseMetadata indicates an expected call of UpdateCourseMetadata. -func (mr *MockCoursesDaoMockRecorder) UpdateCourseMetadata(ctx, course interface{}) *gomock.Call { +func (mr *MockCoursesDaoMockRecorder) UpdateCourseMetadata(ctx, course any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateCourseMetadata", reflect.TypeOf((*MockCoursesDao)(nil).UpdateCourseMetadata), ctx, course) } diff --git a/mock_dao/email.go b/mock_dao/email.go index b79db2da6..8d82c8413 100644 --- a/mock_dao/email.go +++ b/mock_dao/email.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: email.go +// +// Generated by this command: +// +// mockgen -source=email.go -destination ../mock_dao/email.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -9,13 +14,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockEmailDao is a mock of EmailDao interface. type MockEmailDao struct { ctrl *gomock.Controller recorder *MockEmailDaoMockRecorder + isgomock struct{} } // MockEmailDaoMockRecorder is the mock recorder for MockEmailDao. @@ -44,7 +50,7 @@ func (m *MockEmailDao) Create(arg0 context.Context, arg1 *model.Email) error { } // Create indicates an expected call of Create. -func (mr *MockEmailDaoMockRecorder) Create(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEmailDaoMockRecorder) Create(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockEmailDao)(nil).Create), arg0, arg1) } @@ -58,7 +64,7 @@ func (m *MockEmailDao) Delete(arg0 context.Context, arg1 uint) error { } // Delete indicates an expected call of Delete. -func (mr *MockEmailDaoMockRecorder) Delete(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEmailDaoMockRecorder) Delete(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockEmailDao)(nil).Delete), arg0, arg1) } @@ -73,7 +79,7 @@ func (m *MockEmailDao) Get(arg0 context.Context, arg1 uint) (model.Email, error) } // Get indicates an expected call of Get. -func (mr *MockEmailDaoMockRecorder) Get(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEmailDaoMockRecorder) Get(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockEmailDao)(nil).Get), arg0, arg1) } @@ -88,7 +94,7 @@ func (m *MockEmailDao) GetDue(arg0 context.Context, arg1 int) ([]model.Email, er } // GetDue indicates an expected call of GetDue. -func (mr *MockEmailDaoMockRecorder) GetDue(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEmailDaoMockRecorder) GetDue(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDue", reflect.TypeOf((*MockEmailDao)(nil).GetDue), arg0, arg1) } @@ -103,7 +109,7 @@ func (m *MockEmailDao) GetFailed(arg0 context.Context) ([]model.Email, error) { } // GetFailed indicates an expected call of GetFailed. -func (mr *MockEmailDaoMockRecorder) GetFailed(arg0 interface{}) *gomock.Call { +func (mr *MockEmailDaoMockRecorder) GetFailed(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFailed", reflect.TypeOf((*MockEmailDao)(nil).GetFailed), arg0) } @@ -117,7 +123,7 @@ func (m *MockEmailDao) Save(arg0 context.Context, arg1 *model.Email) error { } // Save indicates an expected call of Save. -func (mr *MockEmailDaoMockRecorder) Save(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockEmailDaoMockRecorder) Save(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Save", reflect.TypeOf((*MockEmailDao)(nil).Save), arg0, arg1) } diff --git a/mock_dao/file.go b/mock_dao/file.go index 43011c5de..0094275e2 100644 --- a/mock_dao/file.go +++ b/mock_dao/file.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: file.go +// +// Generated by this command: +// +// mockgen -source=file.go -destination ../mock_dao/file.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockFileDao is a mock of FileDao interface. type MockFileDao struct { ctrl *gomock.Controller recorder *MockFileDaoMockRecorder + isgomock struct{} } // MockFileDaoMockRecorder is the mock recorder for MockFileDao. @@ -58,7 +64,7 @@ func (m *MockFileDao) DeleteFile(id uint) error { } // DeleteFile indicates an expected call of DeleteFile. -func (mr *MockFileDaoMockRecorder) DeleteFile(id interface{}) *gomock.Call { +func (mr *MockFileDaoMockRecorder) DeleteFile(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteFile", reflect.TypeOf((*MockFileDao)(nil).DeleteFile), id) } @@ -73,7 +79,7 @@ func (m *MockFileDao) GetFileById(id string) (model.File, error) { } // GetFileById indicates an expected call of GetFileById. -func (mr *MockFileDaoMockRecorder) GetFileById(id interface{}) *gomock.Call { +func (mr *MockFileDaoMockRecorder) GetFileById(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFileById", reflect.TypeOf((*MockFileDao)(nil).GetFileById), id) } @@ -87,7 +93,7 @@ func (m *MockFileDao) NewFile(f *model.File) error { } // NewFile indicates an expected call of NewFile. -func (mr *MockFileDaoMockRecorder) NewFile(f interface{}) *gomock.Call { +func (mr *MockFileDaoMockRecorder) NewFile(f any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewFile", reflect.TypeOf((*MockFileDao)(nil).NewFile), f) } @@ -101,7 +107,7 @@ func (m *MockFileDao) SetThumbnail(streamId uint, thumb model.File) error { } // SetThumbnail indicates an expected call of SetThumbnail. -func (mr *MockFileDaoMockRecorder) SetThumbnail(streamId, thumb interface{}) *gomock.Call { +func (mr *MockFileDaoMockRecorder) SetThumbnail(streamId, thumb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetThumbnail", reflect.TypeOf((*MockFileDao)(nil).SetThumbnail), streamId, thumb) } @@ -115,7 +121,7 @@ func (m *MockFileDao) UpdateFile(id string, f *model.File) error { } // UpdateFile indicates an expected call of UpdateFile. -func (mr *MockFileDaoMockRecorder) UpdateFile(id, f interface{}) *gomock.Call { +func (mr *MockFileDaoMockRecorder) UpdateFile(id, f any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFile", reflect.TypeOf((*MockFileDao)(nil).UpdateFile), id, f) } diff --git a/mock_dao/info-page.go b/mock_dao/info-page.go index 07944e569..e5b7641a7 100644 --- a/mock_dao/info-page.go +++ b/mock_dao/info-page.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: info-page.go +// +// Generated by this command: +// +// mockgen -source=info-page.go -destination ../mock_dao/info-page.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockInfoPageDao is a mock of InfoPageDao interface. type MockInfoPageDao struct { ctrl *gomock.Controller recorder *MockInfoPageDaoMockRecorder + isgomock struct{} } // MockInfoPageDaoMockRecorder is the mock recorder for MockInfoPageDao. @@ -59,7 +65,7 @@ func (m *MockInfoPageDao) GetById(arg0 uint) (model.InfoPage, error) { } // GetById indicates an expected call of GetById. -func (mr *MockInfoPageDaoMockRecorder) GetById(arg0 interface{}) *gomock.Call { +func (mr *MockInfoPageDaoMockRecorder) GetById(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetById", reflect.TypeOf((*MockInfoPageDao)(nil).GetById), arg0) } @@ -73,7 +79,7 @@ func (m *MockInfoPageDao) New(arg0 *model.InfoPage) error { } // New indicates an expected call of New. -func (mr *MockInfoPageDaoMockRecorder) New(arg0 interface{}) *gomock.Call { +func (mr *MockInfoPageDaoMockRecorder) New(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockInfoPageDao)(nil).New), arg0) } @@ -87,7 +93,7 @@ func (m *MockInfoPageDao) Update(arg0 uint, arg1 *model.InfoPage) error { } // Update indicates an expected call of Update. -func (mr *MockInfoPageDaoMockRecorder) Update(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockInfoPageDaoMockRecorder) Update(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockInfoPageDao)(nil).Update), arg0, arg1) } diff --git a/mock_dao/ingest_server.go b/mock_dao/ingest_server.go index 25ed2836b..0b1966ef4 100644 --- a/mock_dao/ingest_server.go +++ b/mock_dao/ingest_server.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ingest_server.go +// +// Generated by this command: +// +// mockgen -source=ingest_server.go -destination ../mock_dao/ingest_server.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockIngestServerDao is a mock of IngestServerDao interface. type MockIngestServerDao struct { ctrl *gomock.Controller recorder *MockIngestServerDaoMockRecorder + isgomock struct{} } // MockIngestServerDaoMockRecorder is the mock recorder for MockIngestServerDao. @@ -59,7 +65,7 @@ func (m *MockIngestServerDao) GetStreamSlot(ingestServerID uint) (model.StreamNa } // GetStreamSlot indicates an expected call of GetStreamSlot. -func (mr *MockIngestServerDaoMockRecorder) GetStreamSlot(ingestServerID interface{}) *gomock.Call { +func (mr *MockIngestServerDaoMockRecorder) GetStreamSlot(ingestServerID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStreamSlot", reflect.TypeOf((*MockIngestServerDao)(nil).GetStreamSlot), ingestServerID) } @@ -74,7 +80,7 @@ func (m *MockIngestServerDao) GetTranscodedStreamSlot(ingestServerID uint) (mode } // GetTranscodedStreamSlot indicates an expected call of GetTranscodedStreamSlot. -func (mr *MockIngestServerDaoMockRecorder) GetTranscodedStreamSlot(ingestServerID interface{}) *gomock.Call { +func (mr *MockIngestServerDaoMockRecorder) GetTranscodedStreamSlot(ingestServerID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTranscodedStreamSlot", reflect.TypeOf((*MockIngestServerDao)(nil).GetTranscodedStreamSlot), ingestServerID) } @@ -88,7 +94,7 @@ func (m *MockIngestServerDao) RemoveStreamFromSlot(streamID uint) error { } // RemoveStreamFromSlot indicates an expected call of RemoveStreamFromSlot. -func (mr *MockIngestServerDaoMockRecorder) RemoveStreamFromSlot(streamID interface{}) *gomock.Call { +func (mr *MockIngestServerDaoMockRecorder) RemoveStreamFromSlot(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveStreamFromSlot", reflect.TypeOf((*MockIngestServerDao)(nil).RemoveStreamFromSlot), streamID) } @@ -100,7 +106,7 @@ func (m *MockIngestServerDao) SaveIngestServer(server model.IngestServer) { } // SaveIngestServer indicates an expected call of SaveIngestServer. -func (mr *MockIngestServerDaoMockRecorder) SaveIngestServer(server interface{}) *gomock.Call { +func (mr *MockIngestServerDaoMockRecorder) SaveIngestServer(server any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveIngestServer", reflect.TypeOf((*MockIngestServerDao)(nil).SaveIngestServer), server) } @@ -112,7 +118,7 @@ func (m *MockIngestServerDao) SaveSlot(slot model.StreamName) { } // SaveSlot indicates an expected call of SaveSlot. -func (mr *MockIngestServerDaoMockRecorder) SaveSlot(slot interface{}) *gomock.Call { +func (mr *MockIngestServerDaoMockRecorder) SaveSlot(slot any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveSlot", reflect.TypeOf((*MockIngestServerDao)(nil).SaveSlot), slot) } diff --git a/mock_dao/lecture_halls.go b/mock_dao/lecture_halls.go index 3dc06957c..c8999943a 100644 --- a/mock_dao/lecture_halls.go +++ b/mock_dao/lecture_halls.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: lecture_halls.go +// +// Generated by this command: +// +// mockgen -source=lecture_halls.go -destination ../mock_dao/lecture_halls.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -9,13 +14,14 @@ import ( dao "github.com/TUM-Dev/gocast/dao" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLectureHallsDao is a mock of LectureHallsDao interface. type MockLectureHallsDao struct { ctrl *gomock.Controller recorder *MockLectureHallsDaoMockRecorder + isgomock struct{} } // MockLectureHallsDaoMockRecorder is the mock recorder for MockLectureHallsDao. @@ -42,7 +48,7 @@ func (m *MockLectureHallsDao) CreateLectureHall(lectureHall model.LectureHall) { } // CreateLectureHall indicates an expected call of CreateLectureHall. -func (mr *MockLectureHallsDaoMockRecorder) CreateLectureHall(lectureHall interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) CreateLectureHall(lectureHall any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLectureHall", reflect.TypeOf((*MockLectureHallsDao)(nil).CreateLectureHall), lectureHall) } @@ -56,7 +62,7 @@ func (m *MockLectureHallsDao) DeleteLectureHall(id uint) error { } // DeleteLectureHall indicates an expected call of DeleteLectureHall. -func (mr *MockLectureHallsDaoMockRecorder) DeleteLectureHall(id interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) DeleteLectureHall(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLectureHall", reflect.TypeOf((*MockLectureHallsDao)(nil).DeleteLectureHall), id) } @@ -71,7 +77,7 @@ func (m *MockLectureHallsDao) FindPreset(lectureHallID, presetID string) (model. } // FindPreset indicates an expected call of FindPreset. -func (mr *MockLectureHallsDaoMockRecorder) FindPreset(lectureHallID, presetID interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) FindPreset(lectureHallID, presetID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindPreset", reflect.TypeOf((*MockLectureHallsDao)(nil).FindPreset), lectureHallID, presetID) } @@ -100,7 +106,7 @@ func (m *MockLectureHallsDao) GetLectureHallByID(id uint) (model.LectureHall, er } // GetLectureHallByID indicates an expected call of GetLectureHallByID. -func (mr *MockLectureHallsDaoMockRecorder) GetLectureHallByID(id interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) GetLectureHallByID(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLectureHallByID", reflect.TypeOf((*MockLectureHallsDao)(nil).GetLectureHallByID), id) } @@ -115,7 +121,7 @@ func (m *MockLectureHallsDao) GetLectureHallByPartialName(name string) (model.Le } // GetLectureHallByPartialName indicates an expected call of GetLectureHallByPartialName. -func (mr *MockLectureHallsDaoMockRecorder) GetLectureHallByPartialName(name interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) GetLectureHallByPartialName(name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLectureHallByPartialName", reflect.TypeOf((*MockLectureHallsDao)(nil).GetLectureHallByPartialName), name) } @@ -130,7 +136,7 @@ func (m *MockLectureHallsDao) GetStreamsForLectureHallIcal(userId uint, lectureH } // GetStreamsForLectureHallIcal indicates an expected call of GetStreamsForLectureHallIcal. -func (mr *MockLectureHallsDaoMockRecorder) GetStreamsForLectureHallIcal(userId, lectureHalls, all interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) GetStreamsForLectureHallIcal(userId, lectureHalls, all any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStreamsForLectureHallIcal", reflect.TypeOf((*MockLectureHallsDao)(nil).GetStreamsForLectureHallIcal), userId, lectureHalls, all) } @@ -144,7 +150,7 @@ func (m *MockLectureHallsDao) SaveLectureHall(lectureHall model.LectureHall) err } // SaveLectureHall indicates an expected call of SaveLectureHall. -func (mr *MockLectureHallsDaoMockRecorder) SaveLectureHall(lectureHall interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) SaveLectureHall(lectureHall any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveLectureHall", reflect.TypeOf((*MockLectureHallsDao)(nil).SaveLectureHall), lectureHall) } @@ -156,7 +162,7 @@ func (m *MockLectureHallsDao) SaveLectureHallFullAssoc(lectureHall model.Lecture } // SaveLectureHallFullAssoc indicates an expected call of SaveLectureHallFullAssoc. -func (mr *MockLectureHallsDaoMockRecorder) SaveLectureHallFullAssoc(lectureHall interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) SaveLectureHallFullAssoc(lectureHall any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveLectureHallFullAssoc", reflect.TypeOf((*MockLectureHallsDao)(nil).SaveLectureHallFullAssoc), lectureHall) } @@ -170,7 +176,7 @@ func (m *MockLectureHallsDao) SavePreset(preset model.CameraPreset) error { } // SavePreset indicates an expected call of SavePreset. -func (mr *MockLectureHallsDaoMockRecorder) SavePreset(preset interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) SavePreset(preset any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SavePreset", reflect.TypeOf((*MockLectureHallsDao)(nil).SavePreset), preset) } @@ -184,7 +190,7 @@ func (m *MockLectureHallsDao) UnsetDefaults(lectureHallID string) error { } // UnsetDefaults indicates an expected call of UnsetDefaults. -func (mr *MockLectureHallsDaoMockRecorder) UnsetDefaults(lectureHallID interface{}) *gomock.Call { +func (mr *MockLectureHallsDaoMockRecorder) UnsetDefaults(lectureHallID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnsetDefaults", reflect.TypeOf((*MockLectureHallsDao)(nil).UnsetDefaults), lectureHallID) } diff --git a/mock_dao/notifications.go b/mock_dao/notifications.go index e81445492..6b288b03c 100644 --- a/mock_dao/notifications.go +++ b/mock_dao/notifications.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: notifications.go +// +// Generated by this command: +// +// mockgen -source=notifications.go -destination ../mock_dao/notifications.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockNotificationsDao is a mock of NotificationsDao interface. type MockNotificationsDao struct { ctrl *gomock.Controller recorder *MockNotificationsDaoMockRecorder + isgomock struct{} } // MockNotificationsDaoMockRecorder is the mock recorder for MockNotificationsDao. @@ -43,7 +49,7 @@ func (m *MockNotificationsDao) AddNotification(notification *model.Notification) } // AddNotification indicates an expected call of AddNotification. -func (mr *MockNotificationsDaoMockRecorder) AddNotification(notification interface{}) *gomock.Call { +func (mr *MockNotificationsDaoMockRecorder) AddNotification(notification any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNotification", reflect.TypeOf((*MockNotificationsDao)(nil).AddNotification), notification) } @@ -57,7 +63,7 @@ func (m *MockNotificationsDao) DeleteNotification(id uint) error { } // DeleteNotification indicates an expected call of DeleteNotification. -func (mr *MockNotificationsDaoMockRecorder) DeleteNotification(id interface{}) *gomock.Call { +func (mr *MockNotificationsDaoMockRecorder) DeleteNotification(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteNotification", reflect.TypeOf((*MockNotificationsDao)(nil).DeleteNotification), id) } @@ -80,7 +86,7 @@ func (mr *MockNotificationsDaoMockRecorder) GetAllNotifications() *gomock.Call { // GetNotifications mocks base method. func (m *MockNotificationsDao) GetNotifications(target ...model.NotificationTarget) ([]model.Notification, error) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range target { varargs = append(varargs, a) } @@ -91,7 +97,7 @@ func (m *MockNotificationsDao) GetNotifications(target ...model.NotificationTarg } // GetNotifications indicates an expected call of GetNotifications. -func (mr *MockNotificationsDaoMockRecorder) GetNotifications(target ...interface{}) *gomock.Call { +func (mr *MockNotificationsDaoMockRecorder) GetNotifications(target ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNotifications", reflect.TypeOf((*MockNotificationsDao)(nil).GetNotifications), target...) } diff --git a/mock_dao/progress.go b/mock_dao/progress.go index 26dd5aeae..083eaff87 100644 --- a/mock_dao/progress.go +++ b/mock_dao/progress.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: progress.go +// +// Generated by this command: +// +// mockgen -source=progress.go -destination ../mock_dao/progress.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockProgressDao is a mock of ProgressDao interface. type MockProgressDao struct { ctrl *gomock.Controller recorder *MockProgressDaoMockRecorder + isgomock struct{} } // MockProgressDaoMockRecorder is the mock recorder for MockProgressDao. @@ -44,7 +50,7 @@ func (m *MockProgressDao) GetProgressesForUser(userID uint) ([]model.StreamProgr } // GetProgressesForUser indicates an expected call of GetProgressesForUser. -func (mr *MockProgressDaoMockRecorder) GetProgressesForUser(userID interface{}) *gomock.Call { +func (mr *MockProgressDaoMockRecorder) GetProgressesForUser(userID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProgressesForUser", reflect.TypeOf((*MockProgressDao)(nil).GetProgressesForUser), userID) } @@ -59,7 +65,7 @@ func (m *MockProgressDao) LoadProgress(userID uint, streamIDs []uint) ([]model.S } // LoadProgress indicates an expected call of LoadProgress. -func (mr *MockProgressDaoMockRecorder) LoadProgress(userID, streamIDs interface{}) *gomock.Call { +func (mr *MockProgressDaoMockRecorder) LoadProgress(userID, streamIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadProgress", reflect.TypeOf((*MockProgressDao)(nil).LoadProgress), userID, streamIDs) } @@ -73,7 +79,7 @@ func (m *MockProgressDao) SaveProgresses(progresses []model.StreamProgress) erro } // SaveProgresses indicates an expected call of SaveProgresses. -func (mr *MockProgressDaoMockRecorder) SaveProgresses(progresses interface{}) *gomock.Call { +func (mr *MockProgressDaoMockRecorder) SaveProgresses(progresses any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveProgresses", reflect.TypeOf((*MockProgressDao)(nil).SaveProgresses), progresses) } @@ -87,7 +93,7 @@ func (m *MockProgressDao) SaveWatchedState(progress *model.StreamProgress) error } // SaveWatchedState indicates an expected call of SaveWatchedState. -func (mr *MockProgressDaoMockRecorder) SaveWatchedState(progress interface{}) *gomock.Call { +func (mr *MockProgressDaoMockRecorder) SaveWatchedState(progress any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveWatchedState", reflect.TypeOf((*MockProgressDao)(nil).SaveWatchedState), progress) } diff --git a/mock_dao/server-notification.go b/mock_dao/server-notification.go index e1cb3fb0c..963c461c7 100644 --- a/mock_dao/server-notification.go +++ b/mock_dao/server-notification.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: server-notification.go +// +// Generated by this command: +// +// mockgen -source=server-notification.go -destination ../mock_dao/server-notification.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockServerNotificationDao is a mock of ServerNotificationDao interface. type MockServerNotificationDao struct { ctrl *gomock.Controller recorder *MockServerNotificationDaoMockRecorder + isgomock struct{} } // MockServerNotificationDaoMockRecorder is the mock recorder for MockServerNotificationDao. @@ -43,7 +49,7 @@ func (m *MockServerNotificationDao) CreateServerNotification(notification model. } // CreateServerNotification indicates an expected call of CreateServerNotification. -func (mr *MockServerNotificationDaoMockRecorder) CreateServerNotification(notification interface{}) *gomock.Call { +func (mr *MockServerNotificationDaoMockRecorder) CreateServerNotification(notification any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateServerNotification", reflect.TypeOf((*MockServerNotificationDao)(nil).CreateServerNotification), notification) } @@ -57,7 +63,7 @@ func (m *MockServerNotificationDao) DeleteServerNotification(notificationId stri } // DeleteServerNotification indicates an expected call of DeleteServerNotification. -func (mr *MockServerNotificationDaoMockRecorder) DeleteServerNotification(notificationId interface{}) *gomock.Call { +func (mr *MockServerNotificationDaoMockRecorder) DeleteServerNotification(notificationId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteServerNotification", reflect.TypeOf((*MockServerNotificationDao)(nil).DeleteServerNotification), notificationId) } @@ -101,7 +107,7 @@ func (m *MockServerNotificationDao) UpdateServerNotification(notification model. } // UpdateServerNotification indicates an expected call of UpdateServerNotification. -func (mr *MockServerNotificationDaoMockRecorder) UpdateServerNotification(notification, id interface{}) *gomock.Call { +func (mr *MockServerNotificationDaoMockRecorder) UpdateServerNotification(notification, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateServerNotification", reflect.TypeOf((*MockServerNotificationDao)(nil).UpdateServerNotification), notification, id) } diff --git a/mock_dao/statistics.go b/mock_dao/statistics.go index 0be344fb3..19267a4b0 100644 --- a/mock_dao/statistics.go +++ b/mock_dao/statistics.go @@ -1,26 +1,27 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: dao/statistics.go +// Source: statistics.go // // Generated by this command: // -// mockgen -source dao/statistics.go -destination mock_dao/statistics.go +// mockgen -source=statistics.go -destination ../mock_dao/statistics.go // // Package mock_dao is a generated GoMock package. package mock_dao import ( - "github.com/golang/mock/gomock" reflect "reflect" dao "github.com/TUM-Dev/gocast/dao" model "github.com/TUM-Dev/gocast/model" + gomock "go.uber.org/mock/gomock" ) // MockStatisticsDao is a mock of StatisticsDao interface. type MockStatisticsDao struct { ctrl *gomock.Controller recorder *MockStatisticsDaoMockRecorder + isgomock struct{} } // MockStatisticsDaoMockRecorder is the mock recorder for MockStatisticsDao. diff --git a/mock_dao/streams.go b/mock_dao/streams.go index 378ed544c..9d7fdf938 100644 --- a/mock_dao/streams.go +++ b/mock_dao/streams.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: streams.go +// +// Generated by this command: +// +// mockgen -source=streams.go -destination ../mock_dao/streams.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -11,13 +16,14 @@ import ( dao "github.com/TUM-Dev/gocast/dao" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockStreamsDao is a mock of StreamsDao interface. type MockStreamsDao struct { ctrl *gomock.Controller recorder *MockStreamsDaoMockRecorder + isgomock struct{} } // MockStreamsDaoMockRecorder is the mock recorder for MockStreamsDao. @@ -46,7 +52,7 @@ func (m *MockStreamsDao) AddVodView(id string) error { } // AddVodView indicates an expected call of AddVodView. -func (mr *MockStreamsDaoMockRecorder) AddVodView(id interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) AddVodView(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddVodView", reflect.TypeOf((*MockStreamsDao)(nil).AddVodView), id) } @@ -60,7 +66,7 @@ func (m *MockStreamsDao) ClearWorkersForStream(stream model.Stream) error { } // ClearWorkersForStream indicates an expected call of ClearWorkersForStream. -func (mr *MockStreamsDaoMockRecorder) ClearWorkersForStream(stream interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) ClearWorkersForStream(stream any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearWorkersForStream", reflect.TypeOf((*MockStreamsDao)(nil).ClearWorkersForStream), stream) } @@ -74,7 +80,7 @@ func (m *MockStreamsDao) CreateStream(stream *model.Stream) error { } // CreateStream indicates an expected call of CreateStream. -func (mr *MockStreamsDaoMockRecorder) CreateStream(stream interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) CreateStream(stream any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateStream", reflect.TypeOf((*MockStreamsDao)(nil).CreateStream), stream) } @@ -88,7 +94,7 @@ func (m *MockStreamsDao) DeleteLectureSeries(arg0 string) error { } // DeleteLectureSeries indicates an expected call of DeleteLectureSeries. -func (mr *MockStreamsDaoMockRecorder) DeleteLectureSeries(arg0 interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) DeleteLectureSeries(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLectureSeries", reflect.TypeOf((*MockStreamsDao)(nil).DeleteLectureSeries), arg0) } @@ -102,7 +108,7 @@ func (m *MockStreamsDao) DeleteSilences(streamID string) error { } // DeleteSilences indicates an expected call of DeleteSilences. -func (mr *MockStreamsDaoMockRecorder) DeleteSilences(streamID interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) DeleteSilences(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSilences", reflect.TypeOf((*MockStreamsDao)(nil).DeleteSilences), streamID) } @@ -114,7 +120,7 @@ func (m *MockStreamsDao) DeleteStream(streamID string) { } // DeleteStream indicates an expected call of DeleteStream. -func (mr *MockStreamsDaoMockRecorder) DeleteStream(streamID interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) DeleteStream(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteStream", reflect.TypeOf((*MockStreamsDao)(nil).DeleteStream), streamID) } @@ -126,7 +132,7 @@ func (m *MockStreamsDao) DeleteStreamsWithTumID(ids []uint) { } // DeleteStreamsWithTumID indicates an expected call of DeleteStreamsWithTumID. -func (mr *MockStreamsDaoMockRecorder) DeleteStreamsWithTumID(ids interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) DeleteStreamsWithTumID(ids any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteStreamsWithTumID", reflect.TypeOf((*MockStreamsDao)(nil).DeleteStreamsWithTumID), ids) } @@ -138,7 +144,7 @@ func (m *MockStreamsDao) DeleteUnit(id uint) { } // DeleteUnit indicates an expected call of DeleteUnit. -func (mr *MockStreamsDaoMockRecorder) DeleteUnit(id interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) DeleteUnit(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUnit", reflect.TypeOf((*MockStreamsDao)(nil).DeleteUnit), id) } @@ -150,7 +156,7 @@ func (m *MockStreamsDao) ExecAllStreamsWithCoursesAndSubtitlesBatched(f func([]d } // ExecAllStreamsWithCoursesAndSubtitlesBatched indicates an expected call of ExecAllStreamsWithCoursesAndSubtitlesBatched. -func (mr *MockStreamsDaoMockRecorder) ExecAllStreamsWithCoursesAndSubtitlesBatched(f interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) ExecAllStreamsWithCoursesAndSubtitlesBatched(f any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecAllStreamsWithCoursesAndSubtitlesBatched", reflect.TypeOf((*MockStreamsDao)(nil).ExecAllStreamsWithCoursesAndSubtitlesBatched), f) } @@ -180,7 +186,7 @@ func (m *MockStreamsDao) GetCurrentLive(ctx context.Context) ([]model.Stream, er } // GetCurrentLive indicates an expected call of GetCurrentLive. -func (mr *MockStreamsDaoMockRecorder) GetCurrentLive(ctx interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetCurrentLive(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCurrentLive", reflect.TypeOf((*MockStreamsDao)(nil).GetCurrentLive), ctx) } @@ -195,7 +201,7 @@ func (m *MockStreamsDao) GetCurrentLiveNonHidden(ctx context.Context) ([]model.S } // GetCurrentLiveNonHidden indicates an expected call of GetCurrentLiveNonHidden. -func (mr *MockStreamsDaoMockRecorder) GetCurrentLiveNonHidden(ctx interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetCurrentLiveNonHidden(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCurrentLiveNonHidden", reflect.TypeOf((*MockStreamsDao)(nil).GetCurrentLiveNonHidden), ctx) } @@ -238,7 +244,7 @@ func (m *MockStreamsDao) GetLiveStreamsInLectureHall(lectureHallId uint) ([]mode } // GetLiveStreamsInLectureHall indicates an expected call of GetLiveStreamsInLectureHall. -func (mr *MockStreamsDaoMockRecorder) GetLiveStreamsInLectureHall(lectureHallId interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetLiveStreamsInLectureHall(lectureHallId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLiveStreamsInLectureHall", reflect.TypeOf((*MockStreamsDao)(nil).GetLiveStreamsInLectureHall), lectureHallId) } @@ -254,7 +260,7 @@ func (m *MockStreamsDao) GetSoonStartingStreamInfo(user *model.User, slug string } // GetSoonStartingStreamInfo indicates an expected call of GetSoonStartingStreamInfo. -func (mr *MockStreamsDaoMockRecorder) GetSoonStartingStreamInfo(user, slug, year, term interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetSoonStartingStreamInfo(user, slug, year, term any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSoonStartingStreamInfo", reflect.TypeOf((*MockStreamsDao)(nil).GetSoonStartingStreamInfo), user, slug, year, term) } @@ -269,7 +275,7 @@ func (m *MockStreamsDao) GetStreamByID(ctx context.Context, id string) (model.St } // GetStreamByID indicates an expected call of GetStreamByID. -func (mr *MockStreamsDaoMockRecorder) GetStreamByID(ctx, id interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetStreamByID(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStreamByID", reflect.TypeOf((*MockStreamsDao)(nil).GetStreamByID), ctx, id) } @@ -284,7 +290,7 @@ func (m *MockStreamsDao) GetStreamByKey(ctx context.Context, key string) (model. } // GetStreamByKey indicates an expected call of GetStreamByKey. -func (mr *MockStreamsDaoMockRecorder) GetStreamByKey(ctx, key interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetStreamByKey(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStreamByKey", reflect.TypeOf((*MockStreamsDao)(nil).GetStreamByKey), ctx, key) } @@ -299,7 +305,7 @@ func (m *MockStreamsDao) GetStreamByTumOnlineID(ctx context.Context, id uint) (m } // GetStreamByTumOnlineID indicates an expected call of GetStreamByTumOnlineID. -func (mr *MockStreamsDaoMockRecorder) GetStreamByTumOnlineID(ctx, id interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetStreamByTumOnlineID(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStreamByTumOnlineID", reflect.TypeOf((*MockStreamsDao)(nil).GetStreamByTumOnlineID), ctx, id) } @@ -314,7 +320,7 @@ func (m *MockStreamsDao) GetStreamsByIds(ids []uint) ([]model.Stream, error) { } // GetStreamsByIds indicates an expected call of GetStreamsByIds. -func (mr *MockStreamsDaoMockRecorder) GetStreamsByIds(ids interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetStreamsByIds(ids any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStreamsByIds", reflect.TypeOf((*MockStreamsDao)(nil).GetStreamsByIds), ids) } @@ -329,7 +335,7 @@ func (m *MockStreamsDao) GetStreamsWithWatchState(courseID, userID uint) ([]mode } // GetStreamsWithWatchState indicates an expected call of GetStreamsWithWatchState. -func (mr *MockStreamsDaoMockRecorder) GetStreamsWithWatchState(courseID, userID interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetStreamsWithWatchState(courseID, userID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStreamsWithWatchState", reflect.TypeOf((*MockStreamsDao)(nil).GetStreamsWithWatchState), courseID, userID) } @@ -344,7 +350,7 @@ func (m *MockStreamsDao) GetTranscodingProgressByVersion(streamVersion model.Str } // GetTranscodingProgressByVersion indicates an expected call of GetTranscodingProgressByVersion. -func (mr *MockStreamsDaoMockRecorder) GetTranscodingProgressByVersion(streamVersion, streamId interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetTranscodingProgressByVersion(streamVersion, streamId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTranscodingProgressByVersion", reflect.TypeOf((*MockStreamsDao)(nil).GetTranscodingProgressByVersion), streamVersion, streamId) } @@ -359,7 +365,7 @@ func (m *MockStreamsDao) GetUnitByID(id string) (model.StreamUnit, error) { } // GetUnitByID indicates an expected call of GetUnitByID. -func (mr *MockStreamsDaoMockRecorder) GetUnitByID(id interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetUnitByID(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUnitByID", reflect.TypeOf((*MockStreamsDao)(nil).GetUnitByID), id) } @@ -374,7 +380,7 @@ func (m *MockStreamsDao) GetWorkersForStream(stream model.Stream) ([]model.Worke } // GetWorkersForStream indicates an expected call of GetWorkersForStream. -func (mr *MockStreamsDaoMockRecorder) GetWorkersForStream(stream interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) GetWorkersForStream(stream any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetWorkersForStream", reflect.TypeOf((*MockStreamsDao)(nil).GetWorkersForStream), stream) } @@ -388,7 +394,7 @@ func (m *MockStreamsDao) RemoveTranscodingProgress(streamVersion model.StreamVer } // RemoveTranscodingProgress indicates an expected call of RemoveTranscodingProgress. -func (mr *MockStreamsDaoMockRecorder) RemoveTranscodingProgress(streamVersion, streamId interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) RemoveTranscodingProgress(streamVersion, streamId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveTranscodingProgress", reflect.TypeOf((*MockStreamsDao)(nil).RemoveTranscodingProgress), streamVersion, streamId) } @@ -400,7 +406,7 @@ func (m *MockStreamsDao) SaveCAMURL(stream *model.Stream, url string) { } // SaveCAMURL indicates an expected call of SaveCAMURL. -func (mr *MockStreamsDaoMockRecorder) SaveCAMURL(stream, url interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SaveCAMURL(stream, url any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveCAMURL", reflect.TypeOf((*MockStreamsDao)(nil).SaveCAMURL), stream, url) } @@ -412,7 +418,7 @@ func (m *MockStreamsDao) SaveCOMBURL(stream *model.Stream, url string) { } // SaveCOMBURL indicates an expected call of SaveCOMBURL. -func (mr *MockStreamsDaoMockRecorder) SaveCOMBURL(stream, url interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SaveCOMBURL(stream, url any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveCOMBURL", reflect.TypeOf((*MockStreamsDao)(nil).SaveCOMBURL), stream, url) } @@ -426,7 +432,7 @@ func (m *MockStreamsDao) SaveEndedState(streamID uint, hasEnded bool) error { } // SaveEndedState indicates an expected call of SaveEndedState. -func (mr *MockStreamsDaoMockRecorder) SaveEndedState(streamID, hasEnded interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SaveEndedState(streamID, hasEnded any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveEndedState", reflect.TypeOf((*MockStreamsDao)(nil).SaveEndedState), streamID, hasEnded) } @@ -438,7 +444,7 @@ func (m *MockStreamsDao) SavePRESURL(stream *model.Stream, url string) { } // SavePRESURL indicates an expected call of SavePRESURL. -func (mr *MockStreamsDaoMockRecorder) SavePRESURL(stream, url interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SavePRESURL(stream, url any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SavePRESURL", reflect.TypeOf((*MockStreamsDao)(nil).SavePRESURL), stream, url) } @@ -452,7 +458,7 @@ func (m *MockStreamsDao) SaveStream(vod *model.Stream) error { } // SaveStream indicates an expected call of SaveStream. -func (mr *MockStreamsDaoMockRecorder) SaveStream(vod interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SaveStream(vod any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveStream", reflect.TypeOf((*MockStreamsDao)(nil).SaveStream), vod) } @@ -466,7 +472,7 @@ func (m *MockStreamsDao) SaveTranscodingProgress(progress model.TranscodingProgr } // SaveTranscodingProgress indicates an expected call of SaveTranscodingProgress. -func (mr *MockStreamsDaoMockRecorder) SaveTranscodingProgress(progress interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SaveTranscodingProgress(progress any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveTranscodingProgress", reflect.TypeOf((*MockStreamsDao)(nil).SaveTranscodingProgress), progress) } @@ -480,7 +486,7 @@ func (m *MockStreamsDao) SaveWorkerForStream(stream model.Stream, worker model.W } // SaveWorkerForStream indicates an expected call of SaveWorkerForStream. -func (mr *MockStreamsDaoMockRecorder) SaveWorkerForStream(stream, worker interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SaveWorkerForStream(stream, worker any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveWorkerForStream", reflect.TypeOf((*MockStreamsDao)(nil).SaveWorkerForStream), stream, worker) } @@ -494,7 +500,7 @@ func (m *MockStreamsDao) SetLectureHall(streamIDs []uint, lectureHallID uint) er } // SetLectureHall indicates an expected call of SetLectureHall. -func (mr *MockStreamsDaoMockRecorder) SetLectureHall(streamIDs, lectureHallID interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SetLectureHall(streamIDs, lectureHallID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLectureHall", reflect.TypeOf((*MockStreamsDao)(nil).SetLectureHall), streamIDs, lectureHallID) } @@ -508,7 +514,7 @@ func (m *MockStreamsDao) SetStreamLiveNowTimestampById(streamID uint, liveNowTim } // SetStreamLiveNowTimestampById indicates an expected call of SetStreamLiveNowTimestampById. -func (mr *MockStreamsDaoMockRecorder) SetStreamLiveNowTimestampById(streamID, liveNowTimestamp interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SetStreamLiveNowTimestampById(streamID, liveNowTimestamp any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStreamLiveNowTimestampById", reflect.TypeOf((*MockStreamsDao)(nil).SetStreamLiveNowTimestampById), streamID, liveNowTimestamp) } @@ -522,7 +528,7 @@ func (m *MockStreamsDao) SetStreamNotLiveById(streamID uint) error { } // SetStreamNotLiveById indicates an expected call of SetStreamNotLiveById. -func (mr *MockStreamsDaoMockRecorder) SetStreamNotLiveById(streamID interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) SetStreamNotLiveById(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStreamNotLiveById", reflect.TypeOf((*MockStreamsDao)(nil).SetStreamNotLiveById), streamID) } @@ -536,7 +542,7 @@ func (m *MockStreamsDao) ToggleVisibility(streamId uint, private bool) error { } // ToggleVisibility indicates an expected call of ToggleVisibility. -func (mr *MockStreamsDaoMockRecorder) ToggleVisibility(streamId, private interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) ToggleVisibility(streamId, private any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleVisibility", reflect.TypeOf((*MockStreamsDao)(nil).ToggleVisibility), streamId, private) } @@ -550,7 +556,7 @@ func (m *MockStreamsDao) UnsetLectureHall(streamIDs []uint) error { } // UnsetLectureHall indicates an expected call of UnsetLectureHall. -func (mr *MockStreamsDaoMockRecorder) UnsetLectureHall(streamIDs interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) UnsetLectureHall(streamIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnsetLectureHall", reflect.TypeOf((*MockStreamsDao)(nil).UnsetLectureHall), streamIDs) } @@ -564,7 +570,7 @@ func (m *MockStreamsDao) UpdateLectureSeries(arg0 model.Stream) error { } // UpdateLectureSeries indicates an expected call of UpdateLectureSeries. -func (mr *MockStreamsDaoMockRecorder) UpdateLectureSeries(arg0 interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) UpdateLectureSeries(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateLectureSeries", reflect.TypeOf((*MockStreamsDao)(nil).UpdateLectureSeries), arg0) } @@ -578,7 +584,7 @@ func (m *MockStreamsDao) UpdateSilences(silences []model.Silence, streamID strin } // UpdateSilences indicates an expected call of UpdateSilences. -func (mr *MockStreamsDaoMockRecorder) UpdateSilences(silences, streamID interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) UpdateSilences(silences, streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSilences", reflect.TypeOf((*MockStreamsDao)(nil).UpdateSilences), silences, streamID) } @@ -592,7 +598,7 @@ func (m *MockStreamsDao) UpdateStream(stream model.Stream) error { } // UpdateStream indicates an expected call of UpdateStream. -func (mr *MockStreamsDaoMockRecorder) UpdateStream(stream interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) UpdateStream(stream any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStream", reflect.TypeOf((*MockStreamsDao)(nil).UpdateStream), stream) } @@ -606,7 +612,7 @@ func (m *MockStreamsDao) UpdateStreamFullAssoc(vod *model.Stream) error { } // UpdateStreamFullAssoc indicates an expected call of UpdateStreamFullAssoc. -func (mr *MockStreamsDaoMockRecorder) UpdateStreamFullAssoc(vod interface{}) *gomock.Call { +func (mr *MockStreamsDaoMockRecorder) UpdateStreamFullAssoc(vod any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStreamFullAssoc", reflect.TypeOf((*MockStreamsDao)(nil).UpdateStreamFullAssoc), vod) } diff --git a/mock_dao/subtitles.go b/mock_dao/subtitles.go index ba086919e..aaae5a761 100644 --- a/mock_dao/subtitles.go +++ b/mock_dao/subtitles.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: subtitles.go +// +// Generated by this command: +// +// mockgen -source=subtitles.go -destination ../mock_dao/subtitles.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -9,13 +14,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockSubtitlesDao is a mock of SubtitlesDao interface. type MockSubtitlesDao struct { ctrl *gomock.Controller recorder *MockSubtitlesDaoMockRecorder + isgomock struct{} } // MockSubtitlesDaoMockRecorder is the mock recorder for MockSubtitlesDao. @@ -44,7 +50,7 @@ func (m *MockSubtitlesDao) Create(c context.Context, it *model.Subtitles) error } // Create indicates an expected call of Create. -func (mr *MockSubtitlesDaoMockRecorder) Create(c, it interface{}) *gomock.Call { +func (mr *MockSubtitlesDaoMockRecorder) Create(c, it any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockSubtitlesDao)(nil).Create), c, it) } @@ -58,7 +64,7 @@ func (m *MockSubtitlesDao) CreateOrUpsert(arg0 context.Context, arg1 *model.Subt } // CreateOrUpsert indicates an expected call of CreateOrUpsert. -func (mr *MockSubtitlesDaoMockRecorder) CreateOrUpsert(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSubtitlesDaoMockRecorder) CreateOrUpsert(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOrUpsert", reflect.TypeOf((*MockSubtitlesDao)(nil).CreateOrUpsert), arg0, arg1) } @@ -72,7 +78,7 @@ func (m *MockSubtitlesDao) Delete(arg0 context.Context, arg1 uint) error { } // Delete indicates an expected call of Delete. -func (mr *MockSubtitlesDaoMockRecorder) Delete(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSubtitlesDaoMockRecorder) Delete(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockSubtitlesDao)(nil).Delete), arg0, arg1) } @@ -87,7 +93,7 @@ func (m *MockSubtitlesDao) Get(arg0 context.Context, arg1 uint) (model.Subtitles } // Get indicates an expected call of Get. -func (mr *MockSubtitlesDaoMockRecorder) Get(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSubtitlesDaoMockRecorder) Get(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockSubtitlesDao)(nil).Get), arg0, arg1) } @@ -102,7 +108,7 @@ func (m *MockSubtitlesDao) GetByStreamIDandLang(arg0 context.Context, arg1 uint, } // GetByStreamIDandLang indicates an expected call of GetByStreamIDandLang. -func (mr *MockSubtitlesDaoMockRecorder) GetByStreamIDandLang(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSubtitlesDaoMockRecorder) GetByStreamIDandLang(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByStreamIDandLang", reflect.TypeOf((*MockSubtitlesDao)(nil).GetByStreamIDandLang), arg0, arg1, arg2) } diff --git a/mock_dao/token.go b/mock_dao/token.go index bd072f58c..0889e35ed 100644 --- a/mock_dao/token.go +++ b/mock_dao/token.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: token.go +// +// Generated by this command: +// +// mockgen -source=token.go -destination ../mock_dao/token.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -9,13 +14,14 @@ import ( dao "github.com/TUM-Dev/gocast/dao" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockTokenDao is a mock of TokenDao interface. type MockTokenDao struct { ctrl *gomock.Controller recorder *MockTokenDaoMockRecorder + isgomock struct{} } // MockTokenDaoMockRecorder is the mock recorder for MockTokenDao. @@ -44,7 +50,7 @@ func (m *MockTokenDao) AddToken(token model.Token) error { } // AddToken indicates an expected call of AddToken. -func (mr *MockTokenDaoMockRecorder) AddToken(token interface{}) *gomock.Call { +func (mr *MockTokenDaoMockRecorder) AddToken(token any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddToken", reflect.TypeOf((*MockTokenDao)(nil).AddToken), token) } @@ -58,7 +64,7 @@ func (m *MockTokenDao) DeleteToken(id string) error { } // DeleteToken indicates an expected call of DeleteToken. -func (mr *MockTokenDaoMockRecorder) DeleteToken(id interface{}) *gomock.Call { +func (mr *MockTokenDaoMockRecorder) DeleteToken(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteToken", reflect.TypeOf((*MockTokenDao)(nil).DeleteToken), id) } @@ -73,7 +79,7 @@ func (m *MockTokenDao) GetAllTokens(user *model.User) ([]dao.AllTokensDto, error } // GetAllTokens indicates an expected call of GetAllTokens. -func (mr *MockTokenDaoMockRecorder) GetAllTokens(user interface{}) *gomock.Call { +func (mr *MockTokenDaoMockRecorder) GetAllTokens(user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllTokens", reflect.TypeOf((*MockTokenDao)(nil).GetAllTokens), user) } @@ -88,7 +94,7 @@ func (m *MockTokenDao) GetToken(token string) (model.Token, error) { } // GetToken indicates an expected call of GetToken. -func (mr *MockTokenDaoMockRecorder) GetToken(token interface{}) *gomock.Call { +func (mr *MockTokenDaoMockRecorder) GetToken(token any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetToken", reflect.TypeOf((*MockTokenDao)(nil).GetToken), token) } @@ -103,7 +109,7 @@ func (m *MockTokenDao) GetTokenByID(id string) (model.Token, error) { } // GetTokenByID indicates an expected call of GetTokenByID. -func (mr *MockTokenDaoMockRecorder) GetTokenByID(id interface{}) *gomock.Call { +func (mr *MockTokenDaoMockRecorder) GetTokenByID(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTokenByID", reflect.TypeOf((*MockTokenDao)(nil).GetTokenByID), id) } @@ -117,7 +123,7 @@ func (m *MockTokenDao) TokenUsed(token model.Token) error { } // TokenUsed indicates an expected call of TokenUsed. -func (mr *MockTokenDaoMockRecorder) TokenUsed(token interface{}) *gomock.Call { +func (mr *MockTokenDaoMockRecorder) TokenUsed(token any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TokenUsed", reflect.TypeOf((*MockTokenDao)(nil).TokenUsed), token) } diff --git a/mock_dao/transcoding-failure.go b/mock_dao/transcoding-failure.go index ea4dd3205..4706d5698 100644 --- a/mock_dao/transcoding-failure.go +++ b/mock_dao/transcoding-failure.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: transcoding-failure.go +// +// Generated by this command: +// +// mockgen -source=transcoding-failure.go -destination ../mock_dao/transcoding-failure.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockTranscodingFailureDao is a mock of TranscodingFailureDao interface. type MockTranscodingFailureDao struct { ctrl *gomock.Controller recorder *MockTranscodingFailureDaoMockRecorder + isgomock struct{} } // MockTranscodingFailureDaoMockRecorder is the mock recorder for MockTranscodingFailureDao. @@ -58,7 +64,7 @@ func (m *MockTranscodingFailureDao) Delete(id uint) error { } // Delete indicates an expected call of Delete. -func (mr *MockTranscodingFailureDaoMockRecorder) Delete(id interface{}) *gomock.Call { +func (mr *MockTranscodingFailureDaoMockRecorder) Delete(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockTranscodingFailureDao)(nil).Delete), id) } @@ -72,7 +78,7 @@ func (m *MockTranscodingFailureDao) New(arg0 *model.TranscodingFailure) error { } // New indicates an expected call of New. -func (mr *MockTranscodingFailureDaoMockRecorder) New(arg0 interface{}) *gomock.Call { +func (mr *MockTranscodingFailureDaoMockRecorder) New(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockTranscodingFailureDao)(nil).New), arg0) } diff --git a/mock_dao/upload_key.go b/mock_dao/upload_key.go index 915aa8128..4fc210d50 100644 --- a/mock_dao/upload_key.go +++ b/mock_dao/upload_key.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: upload_key.go +// +// Generated by this command: +// +// mockgen -source=upload_key.go -destination ../mock_dao/upload_key.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockUploadKeyDao is a mock of UploadKeyDao interface. type MockUploadKeyDao struct { ctrl *gomock.Controller recorder *MockUploadKeyDaoMockRecorder + isgomock struct{} } // MockUploadKeyDaoMockRecorder is the mock recorder for MockUploadKeyDao. @@ -43,7 +49,7 @@ func (m *MockUploadKeyDao) CreateUploadKey(key string, stream uint, videoType mo } // CreateUploadKey indicates an expected call of CreateUploadKey. -func (mr *MockUploadKeyDaoMockRecorder) CreateUploadKey(key, stream, videoType interface{}) *gomock.Call { +func (mr *MockUploadKeyDaoMockRecorder) CreateUploadKey(key, stream, videoType any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUploadKey", reflect.TypeOf((*MockUploadKeyDao)(nil).CreateUploadKey), key, stream, videoType) } @@ -57,7 +63,7 @@ func (m *MockUploadKeyDao) DeleteUploadKey(key model.UploadKey) error { } // DeleteUploadKey indicates an expected call of DeleteUploadKey. -func (mr *MockUploadKeyDaoMockRecorder) DeleteUploadKey(key interface{}) *gomock.Call { +func (mr *MockUploadKeyDaoMockRecorder) DeleteUploadKey(key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUploadKey", reflect.TypeOf((*MockUploadKeyDao)(nil).DeleteUploadKey), key) } @@ -72,7 +78,7 @@ func (m *MockUploadKeyDao) GetUploadKey(key string) (model.UploadKey, error) { } // GetUploadKey indicates an expected call of GetUploadKey. -func (mr *MockUploadKeyDaoMockRecorder) GetUploadKey(key interface{}) *gomock.Call { +func (mr *MockUploadKeyDaoMockRecorder) GetUploadKey(key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUploadKey", reflect.TypeOf((*MockUploadKeyDao)(nil).GetUploadKey), key) } diff --git a/mock_dao/users.go b/mock_dao/users.go index 8f8e8a05a..d3773b12c 100644 --- a/mock_dao/users.go +++ b/mock_dao/users.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: users.go +// +// Generated by this command: +// +// mockgen -source=users.go -destination ../mock_dao/users.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -9,13 +14,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockUsersDao is a mock of UsersDao interface. type MockUsersDao struct { ctrl *gomock.Controller recorder *MockUsersDaoMockRecorder + isgomock struct{} } // MockUsersDaoMockRecorder is the mock recorder for MockUsersDao. @@ -44,7 +50,7 @@ func (m *MockUsersDao) AddUserSetting(userSetting *model.UserSetting) error { } // AddUserSetting indicates an expected call of AddUserSetting. -func (mr *MockUsersDaoMockRecorder) AddUserSetting(userSetting interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) AddUserSetting(userSetting any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddUserSetting", reflect.TypeOf((*MockUsersDao)(nil).AddUserSetting), userSetting) } @@ -58,7 +64,7 @@ func (m *MockUsersDao) AddUsersToCourseByTUMIDs(matrNr []string, courseID uint) } // AddUsersToCourseByTUMIDs indicates an expected call of AddUsersToCourseByTUMIDs. -func (mr *MockUsersDaoMockRecorder) AddUsersToCourseByTUMIDs(matrNr, courseID interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) AddUsersToCourseByTUMIDs(matrNr, courseID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddUsersToCourseByTUMIDs", reflect.TypeOf((*MockUsersDao)(nil).AddUsersToCourseByTUMIDs), matrNr, courseID) } @@ -73,7 +79,7 @@ func (m *MockUsersDao) AreUsersEmpty(ctx context.Context) (bool, error) { } // AreUsersEmpty indicates an expected call of AreUsersEmpty. -func (mr *MockUsersDaoMockRecorder) AreUsersEmpty(ctx interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) AreUsersEmpty(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AreUsersEmpty", reflect.TypeOf((*MockUsersDao)(nil).AreUsersEmpty), ctx) } @@ -88,7 +94,7 @@ func (m *MockUsersDao) CreateRegisterLink(ctx context.Context, user model.User) } // CreateRegisterLink indicates an expected call of CreateRegisterLink. -func (mr *MockUsersDaoMockRecorder) CreateRegisterLink(ctx, user interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) CreateRegisterLink(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRegisterLink", reflect.TypeOf((*MockUsersDao)(nil).CreateRegisterLink), ctx, user) } @@ -102,7 +108,7 @@ func (m *MockUsersDao) CreateUser(ctx context.Context, user *model.User) error { } // CreateUser indicates an expected call of CreateUser. -func (mr *MockUsersDaoMockRecorder) CreateUser(ctx, user interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) CreateUser(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUser", reflect.TypeOf((*MockUsersDao)(nil).CreateUser), ctx, user) } @@ -114,7 +120,7 @@ func (m *MockUsersDao) DeleteResetKey(key string) { } // DeleteResetKey indicates an expected call of DeleteResetKey. -func (mr *MockUsersDaoMockRecorder) DeleteResetKey(key interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) DeleteResetKey(key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteResetKey", reflect.TypeOf((*MockUsersDao)(nil).DeleteResetKey), key) } @@ -128,7 +134,7 @@ func (m *MockUsersDao) DeleteUser(ctx context.Context, uid uint) error { } // DeleteUser indicates an expected call of DeleteUser. -func (mr *MockUsersDaoMockRecorder) DeleteUser(ctx, uid interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) DeleteUser(ctx, uid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUser", reflect.TypeOf((*MockUsersDao)(nil).DeleteUser), ctx, uid) } @@ -142,7 +148,7 @@ func (m *MockUsersDao) GetAllAdminsAndLecturers(users *[]model.User) error { } // GetAllAdminsAndLecturers indicates an expected call of GetAllAdminsAndLecturers. -func (mr *MockUsersDaoMockRecorder) GetAllAdminsAndLecturers(users interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) GetAllAdminsAndLecturers(users any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllAdminsAndLecturers", reflect.TypeOf((*MockUsersDao)(nil).GetAllAdminsAndLecturers), users) } @@ -157,7 +163,7 @@ func (m *MockUsersDao) GetUserByEmail(ctx context.Context, email string) (model. } // GetUserByEmail indicates an expected call of GetUserByEmail. -func (mr *MockUsersDaoMockRecorder) GetUserByEmail(ctx, email interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) GetUserByEmail(ctx, email any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserByEmail", reflect.TypeOf((*MockUsersDao)(nil).GetUserByEmail), ctx, email) } @@ -172,7 +178,7 @@ func (m *MockUsersDao) GetUserByID(ctx context.Context, id uint) (model.User, er } // GetUserByID indicates an expected call of GetUserByID. -func (mr *MockUsersDaoMockRecorder) GetUserByID(ctx, id interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) GetUserByID(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserByID", reflect.TypeOf((*MockUsersDao)(nil).GetUserByID), ctx, id) } @@ -187,7 +193,7 @@ func (m *MockUsersDao) GetUserByResetKey(key string) (model.User, error) { } // GetUserByResetKey indicates an expected call of GetUserByResetKey. -func (mr *MockUsersDaoMockRecorder) GetUserByResetKey(key interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) GetUserByResetKey(key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserByResetKey", reflect.TypeOf((*MockUsersDao)(nil).GetUserByResetKey), key) } @@ -202,7 +208,7 @@ func (m *MockUsersDao) HasPinnedCourse(arg0 model.User, arg1 uint) (bool, error) } // HasPinnedCourse indicates an expected call of HasPinnedCourse. -func (mr *MockUsersDaoMockRecorder) HasPinnedCourse(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) HasPinnedCourse(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasPinnedCourse", reflect.TypeOf((*MockUsersDao)(nil).HasPinnedCourse), arg0, arg1) } @@ -217,7 +223,7 @@ func (m *MockUsersDao) IsUserAdmin(ctx context.Context, uid uint) (bool, error) } // IsUserAdmin indicates an expected call of IsUserAdmin. -func (mr *MockUsersDaoMockRecorder) IsUserAdmin(ctx, uid interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) IsUserAdmin(ctx, uid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsUserAdmin", reflect.TypeOf((*MockUsersDao)(nil).IsUserAdmin), ctx, uid) } @@ -231,7 +237,7 @@ func (m *MockUsersDao) PinCourse(user model.User, course model.Course, pin bool) } // PinCourse indicates an expected call of PinCourse. -func (mr *MockUsersDaoMockRecorder) PinCourse(user, course, pin interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) PinCourse(user, course, pin any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PinCourse", reflect.TypeOf((*MockUsersDao)(nil).PinCourse), user, course, pin) } @@ -246,7 +252,7 @@ func (m *MockUsersDao) SearchUser(query string) ([]model.User, error) { } // SearchUser indicates an expected call of SearchUser. -func (mr *MockUsersDaoMockRecorder) SearchUser(query interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) SearchUser(query any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchUser", reflect.TypeOf((*MockUsersDao)(nil).SearchUser), query) } @@ -260,7 +266,7 @@ func (m *MockUsersDao) UpdateUser(user model.User) error { } // UpdateUser indicates an expected call of UpdateUser. -func (mr *MockUsersDaoMockRecorder) UpdateUser(user interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) UpdateUser(user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateUser", reflect.TypeOf((*MockUsersDao)(nil).UpdateUser), user) } @@ -274,7 +280,7 @@ func (m *MockUsersDao) UpsertUser(user *model.User) error { } // UpsertUser indicates an expected call of UpsertUser. -func (mr *MockUsersDaoMockRecorder) UpsertUser(user interface{}) *gomock.Call { +func (mr *MockUsersDaoMockRecorder) UpsertUser(user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpsertUser", reflect.TypeOf((*MockUsersDao)(nil).UpsertUser), user) } diff --git a/mock_dao/video-section.go b/mock_dao/video-section.go index df80d9d99..a63ce159c 100644 --- a/mock_dao/video-section.go +++ b/mock_dao/video-section.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: video-section.go +// +// Generated by this command: +// +// mockgen -source=video-section.go -destination ../mock_dao/video-section.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockVideoSectionDao is a mock of VideoSectionDao interface. type MockVideoSectionDao struct { ctrl *gomock.Controller recorder *MockVideoSectionDaoMockRecorder + isgomock struct{} } // MockVideoSectionDaoMockRecorder is the mock recorder for MockVideoSectionDao. @@ -43,7 +49,7 @@ func (m *MockVideoSectionDao) Create(arg0 []model.VideoSection) error { } // Create indicates an expected call of Create. -func (mr *MockVideoSectionDaoMockRecorder) Create(arg0 interface{}) *gomock.Call { +func (mr *MockVideoSectionDaoMockRecorder) Create(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockVideoSectionDao)(nil).Create), arg0) } @@ -57,7 +63,7 @@ func (m *MockVideoSectionDao) Delete(arg0 uint) error { } // Delete indicates an expected call of Delete. -func (mr *MockVideoSectionDaoMockRecorder) Delete(arg0 interface{}) *gomock.Call { +func (mr *MockVideoSectionDaoMockRecorder) Delete(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockVideoSectionDao)(nil).Delete), arg0) } @@ -72,7 +78,7 @@ func (m *MockVideoSectionDao) Get(arg0 uint) (model.VideoSection, error) { } // Get indicates an expected call of Get. -func (mr *MockVideoSectionDaoMockRecorder) Get(arg0 interface{}) *gomock.Call { +func (mr *MockVideoSectionDaoMockRecorder) Get(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockVideoSectionDao)(nil).Get), arg0) } @@ -87,7 +93,7 @@ func (m *MockVideoSectionDao) GetByStreamId(arg0 uint) ([]model.VideoSection, er } // GetByStreamId indicates an expected call of GetByStreamId. -func (mr *MockVideoSectionDaoMockRecorder) GetByStreamId(arg0 interface{}) *gomock.Call { +func (mr *MockVideoSectionDaoMockRecorder) GetByStreamId(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByStreamId", reflect.TypeOf((*MockVideoSectionDao)(nil).GetByStreamId), arg0) } @@ -101,7 +107,7 @@ func (m *MockVideoSectionDao) Update(arg0 *model.VideoSection) error { } // Update indicates an expected call of Update. -func (mr *MockVideoSectionDaoMockRecorder) Update(arg0 interface{}) *gomock.Call { +func (mr *MockVideoSectionDaoMockRecorder) Update(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockVideoSectionDao)(nil).Update), arg0) } diff --git a/mock_dao/video-seek.go b/mock_dao/video-seek.go index a5dc2c318..1a0554cdc 100644 --- a/mock_dao/video-seek.go +++ b/mock_dao/video-seek.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: video-seek.go +// +// Generated by this command: +// +// mockgen -source=video-seek.go -destination ../mock_dao/video-seek.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockVideoSeekDao is a mock of VideoSeekDao interface. type MockVideoSeekDao struct { ctrl *gomock.Controller recorder *MockVideoSeekDaoMockRecorder + isgomock struct{} } // MockVideoSeekDaoMockRecorder is the mock recorder for MockVideoSeekDao. @@ -43,7 +49,7 @@ func (m *MockVideoSeekDao) Add(streamID string, pos float64) error { } // Add indicates an expected call of Add. -func (mr *MockVideoSeekDaoMockRecorder) Add(streamID, pos interface{}) *gomock.Call { +func (mr *MockVideoSeekDaoMockRecorder) Add(streamID, pos any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockVideoSeekDao)(nil).Add), streamID, pos) } @@ -58,7 +64,7 @@ func (m *MockVideoSeekDao) Get(streamID string) ([]model.VideoSeekChunk, error) } // Get indicates an expected call of Get. -func (mr *MockVideoSeekDaoMockRecorder) Get(streamID interface{}) *gomock.Call { +func (mr *MockVideoSeekDaoMockRecorder) Get(streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockVideoSeekDao)(nil).Get), streamID) } diff --git a/mock_dao/worker.go b/mock_dao/worker.go index 9db0b2eb5..85294718f 100644 --- a/mock_dao/worker.go +++ b/mock_dao/worker.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: worker.go +// +// Generated by this command: +// +// mockgen -source=worker.go -destination ../mock_dao/worker.go +// // Package mock_dao is a generated GoMock package. package mock_dao @@ -9,13 +14,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockWorkerDao is a mock of WorkerDao interface. type MockWorkerDao struct { ctrl *gomock.Controller recorder *MockWorkerDaoMockRecorder + isgomock struct{} } // MockWorkerDaoMockRecorder is the mock recorder for MockWorkerDao. @@ -44,7 +50,7 @@ func (m *MockWorkerDao) CreateWorker(worker *model.Worker) error { } // CreateWorker indicates an expected call of CreateWorker. -func (mr *MockWorkerDaoMockRecorder) CreateWorker(worker interface{}) *gomock.Call { +func (mr *MockWorkerDaoMockRecorder) CreateWorker(worker any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateWorker", reflect.TypeOf((*MockWorkerDao)(nil).CreateWorker), worker) } @@ -58,7 +64,7 @@ func (m *MockWorkerDao) DeleteWorker(workerID string) error { } // DeleteWorker indicates an expected call of DeleteWorker. -func (mr *MockWorkerDaoMockRecorder) DeleteWorker(workerID interface{}) *gomock.Call { +func (mr *MockWorkerDaoMockRecorder) DeleteWorker(workerID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteWorker", reflect.TypeOf((*MockWorkerDao)(nil).DeleteWorker), workerID) } @@ -102,7 +108,7 @@ func (m *MockWorkerDao) GetWorkerByHostname(ctx context.Context, hostname string } // GetWorkerByHostname indicates an expected call of GetWorkerByHostname. -func (mr *MockWorkerDaoMockRecorder) GetWorkerByHostname(ctx, hostname interface{}) *gomock.Call { +func (mr *MockWorkerDaoMockRecorder) GetWorkerByHostname(ctx, hostname any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetWorkerByHostname", reflect.TypeOf((*MockWorkerDao)(nil).GetWorkerByHostname), ctx, hostname) } @@ -117,7 +123,7 @@ func (m *MockWorkerDao) GetWorkerByID(ctx context.Context, workerID string) (mod } // GetWorkerByID indicates an expected call of GetWorkerByID. -func (mr *MockWorkerDaoMockRecorder) GetWorkerByID(ctx, workerID interface{}) *gomock.Call { +func (mr *MockWorkerDaoMockRecorder) GetWorkerByID(ctx, workerID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetWorkerByID", reflect.TypeOf((*MockWorkerDao)(nil).GetWorkerByID), ctx, workerID) } @@ -131,7 +137,7 @@ func (m *MockWorkerDao) SaveWorker(worker model.Worker) error { } // SaveWorker indicates an expected call of SaveWorker. -func (mr *MockWorkerDaoMockRecorder) SaveWorker(worker interface{}) *gomock.Call { +func (mr *MockWorkerDaoMockRecorder) SaveWorker(worker any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveWorker", reflect.TypeOf((*MockWorkerDao)(nil).SaveWorker), worker) } diff --git a/mock_tools/meiliSearch.go b/mock_tools/meiliSearch.go index ebb4c24b0..d63c94060 100644 --- a/mock_tools/meiliSearch.go +++ b/mock_tools/meiliSearch.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: meiliSearch.go +// +// Generated by this command: +// +// mockgen -source=meiliSearch.go -destination ../mock_tools/meiliSearch.go +// // Package mock_tools is a generated GoMock package. package mock_tools @@ -7,14 +12,15 @@ package mock_tools import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" - meilisearch "github.com/meilisearch/meilisearch-go" + meilisearch_go "github.com/meilisearch/meilisearch-go" + gomock "go.uber.org/mock/gomock" ) // MockMeiliSearchInterface is a mock of MeiliSearchInterface interface. type MockMeiliSearchInterface struct { ctrl *gomock.Controller recorder *MockMeiliSearchInterfaceMockRecorder + isgomock struct{} } // MockMeiliSearchInterfaceMockRecorder is the mock recorder for MockMeiliSearchInterface. @@ -35,29 +41,29 @@ func (m *MockMeiliSearchInterface) EXPECT() *MockMeiliSearchInterfaceMockRecorde } // Search mocks base method. -func (m *MockMeiliSearchInterface) Search(q string, limit int64, searchType int, courseFilter, streamFilter, subtitleFilter string) *meilisearch.MultiSearchResponse { +func (m *MockMeiliSearchInterface) Search(q string, limit int64, searchType int, courseFilter, streamFilter, subtitleFilter string) *meilisearch_go.MultiSearchResponse { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Search", q, limit, searchType, courseFilter, streamFilter, subtitleFilter) - ret0, _ := ret[0].(*meilisearch.MultiSearchResponse) + ret0, _ := ret[0].(*meilisearch_go.MultiSearchResponse) return ret0 } // Search indicates an expected call of Search. -func (mr *MockMeiliSearchInterfaceMockRecorder) Search(q, limit, searchType, courseFilter, streamFilter, subtitleFilter interface{}) *gomock.Call { +func (mr *MockMeiliSearchInterfaceMockRecorder) Search(q, limit, searchType, courseFilter, streamFilter, subtitleFilter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockMeiliSearchInterface)(nil).Search), q, limit, searchType, courseFilter, streamFilter, subtitleFilter) } // SearchSubtitles mocks base method. -func (m *MockMeiliSearchInterface) SearchSubtitles(q string, streamID uint) *meilisearch.SearchResponse { +func (m *MockMeiliSearchInterface) SearchSubtitles(q string, streamID uint) *meilisearch_go.SearchResponse { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SearchSubtitles", q, streamID) - ret0, _ := ret[0].(*meilisearch.SearchResponse) + ret0, _ := ret[0].(*meilisearch_go.SearchResponse) return ret0 } // SearchSubtitles indicates an expected call of SearchSubtitles. -func (mr *MockMeiliSearchInterfaceMockRecorder) SearchSubtitles(q, streamID interface{}) *gomock.Call { +func (mr *MockMeiliSearchInterfaceMockRecorder) SearchSubtitles(q, streamID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchSubtitles", reflect.TypeOf((*MockMeiliSearchInterface)(nil).SearchSubtitles), q, streamID) } diff --git a/mock_tools/mock_camera/camera.go b/mock_tools/mock_camera/camera.go index 2fd5f41f1..e1dbb9511 100644 --- a/mock_tools/mock_camera/camera.go +++ b/mock_tools/mock_camera/camera.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: camera.go +// +// Generated by this command: +// +// mockgen -source=camera.go -destination ../../mock_tools/mock_camera/camera.go +// // Package mock_camera is a generated GoMock package. package mock_camera @@ -8,13 +13,14 @@ import ( reflect "reflect" model "github.com/TUM-Dev/gocast/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockCam is a mock of Cam interface. type MockCam struct { ctrl *gomock.Controller recorder *MockCamMockRecorder + isgomock struct{} } // MockCamMockRecorder is the mock recorder for MockCam. @@ -58,7 +64,7 @@ func (m *MockCam) SetPreset(presetId int) error { } // SetPreset indicates an expected call of SetPreset. -func (mr *MockCamMockRecorder) SetPreset(presetId interface{}) *gomock.Call { +func (mr *MockCamMockRecorder) SetPreset(presetId any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetPreset", reflect.TypeOf((*MockCam)(nil).SetPreset), presetId) } @@ -73,7 +79,7 @@ func (m *MockCam) TakeSnapshot(outDir string) (string, error) { } // TakeSnapshot indicates an expected call of TakeSnapshot. -func (mr *MockCamMockRecorder) TakeSnapshot(outDir interface{}) *gomock.Call { +func (mr *MockCamMockRecorder) TakeSnapshot(outDir any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TakeSnapshot", reflect.TypeOf((*MockCam)(nil).TakeSnapshot), outDir) } diff --git a/mock_tools/presets.go b/mock_tools/presets.go index 0645946f6..5c8963309 100644 --- a/mock_tools/presets.go +++ b/mock_tools/presets.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: presets.go +// +// Generated by this command: +// +// mockgen -source=presets.go -destination ../mock_tools/presets.go +// // Package mock_tools is a generated GoMock package. package mock_tools @@ -10,13 +15,14 @@ import ( model "github.com/TUM-Dev/gocast/model" camera "github.com/TUM-Dev/gocast/tools/camera" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockPresetUtility is a mock of PresetUtility interface. type MockPresetUtility struct { ctrl *gomock.Controller recorder *MockPresetUtilityMockRecorder + isgomock struct{} } // MockPresetUtilityMockRecorder is the mock recorder for MockPresetUtility. @@ -43,7 +49,7 @@ func (m *MockPresetUtility) FetchCameraPresets(arg0 context.Context) { } // FetchCameraPresets indicates an expected call of FetchCameraPresets. -func (mr *MockPresetUtilityMockRecorder) FetchCameraPresets(arg0 interface{}) *gomock.Call { +func (mr *MockPresetUtilityMockRecorder) FetchCameraPresets(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchCameraPresets", reflect.TypeOf((*MockPresetUtility)(nil).FetchCameraPresets), arg0) } @@ -55,7 +61,7 @@ func (m *MockPresetUtility) FetchLHPresets(arg0 model.LectureHall) { } // FetchLHPresets indicates an expected call of FetchLHPresets. -func (mr *MockPresetUtilityMockRecorder) FetchLHPresets(arg0 interface{}) *gomock.Call { +func (mr *MockPresetUtilityMockRecorder) FetchLHPresets(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchLHPresets", reflect.TypeOf((*MockPresetUtility)(nil).FetchLHPresets), arg0) } @@ -70,7 +76,7 @@ func (m *MockPresetUtility) ProvideCamera(arg0 model.CameraType, arg1 string) (c } // ProvideCamera indicates an expected call of ProvideCamera. -func (mr *MockPresetUtilityMockRecorder) ProvideCamera(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockPresetUtilityMockRecorder) ProvideCamera(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProvideCamera", reflect.TypeOf((*MockPresetUtility)(nil).ProvideCamera), arg0, arg1) } @@ -82,7 +88,7 @@ func (m *MockPresetUtility) TakeSnapshot(arg0 model.CameraPreset) { } // TakeSnapshot indicates an expected call of TakeSnapshot. -func (mr *MockPresetUtilityMockRecorder) TakeSnapshot(arg0 interface{}) *gomock.Call { +func (mr *MockPresetUtilityMockRecorder) TakeSnapshot(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TakeSnapshot", reflect.TypeOf((*MockPresetUtility)(nil).TakeSnapshot), arg0) } @@ -94,7 +100,7 @@ func (m *MockPresetUtility) UsePreset(arg0 model.CameraPreset) { } // UsePreset indicates an expected call of UsePreset. -func (mr *MockPresetUtilityMockRecorder) UsePreset(arg0 interface{}) *gomock.Call { +func (mr *MockPresetUtilityMockRecorder) UsePreset(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UsePreset", reflect.TypeOf((*MockPresetUtility)(nil).UsePreset), arg0) } From 7b3c0a491ef4ec1be6eef4630fcdc3fa09d395d4 Mon Sep 17 00:00:00 2001 From: Joscha Henningsen Date: Fri, 10 Jan 2025 15:52:34 +0100 Subject: [PATCH 22/22] chore: upgrade mocking framework --- api/audit_test.go | 2 +- api/bookmarks_test.go | 2 +- api/chat_test.go | 2 +- api/courses_test.go | 2 +- api/download_ics_test.go | 2 +- api/download_test.go | 2 +- api/info-pages_test.go | 2 +- api/lecture_halls_test.go | 2 +- api/notifications_test.go | 2 +- api/progress_test.go | 2 +- api/search_test.go | 2 +- api/seek_stats_test.go | 2 +- api/statistics_test.go | 2 +- api/stream_test.go | 2 +- api/token_test.go | 2 +- api/users_test.go | 2 +- api/worker_test.go | 2 +- go.mod | 8 +++++--- go.sum | 5 ++++- go.work | 4 +++- go.work.sum | 20 ++++++++++++++++++++ tools/testutils/testdata.go | 2 +- 22 files changed, 50 insertions(+), 23 deletions(-) diff --git a/api/audit_test.go b/api/audit_test.go index b8790fad2..1df21b903 100644 --- a/api/audit_test.go +++ b/api/audit_test.go @@ -10,8 +10,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func TestGetAudits(t *testing.T) { diff --git a/api/bookmarks_test.go b/api/bookmarks_test.go index 5b604465f..fdef50808 100644 --- a/api/bookmarks_test.go +++ b/api/bookmarks_test.go @@ -12,8 +12,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" "gorm.io/gorm" ) diff --git a/api/chat_test.go b/api/chat_test.go index 1235b6e5e..c46238365 100644 --- a/api/chat_test.go +++ b/api/chat_test.go @@ -11,8 +11,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" "gorm.io/gorm" ) diff --git a/api/courses_test.go b/api/courses_test.go index b9983c1f0..895addb3b 100644 --- a/api/courses_test.go +++ b/api/courses_test.go @@ -16,9 +16,9 @@ import ( "github.com/TUM-Dev/gocast/tools/testutils" "github.com/dgraph-io/ristretto" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" "github.com/u2takey/go-utils/uuid" + "go.uber.org/mock/gomock" "gorm.io/gorm" ) diff --git a/api/download_ics_test.go b/api/download_ics_test.go index ce63f322a..1b1ceb960 100644 --- a/api/download_ics_test.go +++ b/api/download_ics_test.go @@ -14,8 +14,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func TestDownloadICS(t *testing.T) { diff --git a/api/download_test.go b/api/download_test.go index 4d488ab08..e0163fc63 100644 --- a/api/download_test.go +++ b/api/download_test.go @@ -14,8 +14,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func DownloadRouterWrapper(r *gin.Engine) { diff --git a/api/info-pages_test.go b/api/info-pages_test.go index cc1775afc..41abcfaa0 100644 --- a/api/info-pages_test.go +++ b/api/info-pages_test.go @@ -14,8 +14,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func InfoPagesRouterWrapper(r *gin.Engine) { diff --git a/api/lecture_halls_test.go b/api/lecture_halls_test.go index 500f2737a..ea841661e 100644 --- a/api/lecture_halls_test.go +++ b/api/lecture_halls_test.go @@ -16,8 +16,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func LectureHallRouterWrapper(t *testing.T) func(r *gin.Engine) { diff --git a/api/notifications_test.go b/api/notifications_test.go index 26cd5ee7a..43145fed1 100644 --- a/api/notifications_test.go +++ b/api/notifications_test.go @@ -13,8 +13,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func NotificationsRouterWrapper(r *gin.Engine) { diff --git a/api/progress_test.go b/api/progress_test.go index bb8a9d8d0..0bab7c6b9 100644 --- a/api/progress_test.go +++ b/api/progress_test.go @@ -13,8 +13,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" "gorm.io/gorm" ) diff --git a/api/search_test.go b/api/search_test.go index 8ad559d0d..0da0b4520 100644 --- a/api/search_test.go +++ b/api/search_test.go @@ -17,9 +17,9 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" "github.com/meilisearch/meilisearch-go" + "go.uber.org/mock/gomock" ) func SearchRouterWrapper(r *gin.Engine) { diff --git a/api/seek_stats_test.go b/api/seek_stats_test.go index a281f5cd8..16c08b3cd 100644 --- a/api/seek_stats_test.go +++ b/api/seek_stats_test.go @@ -11,8 +11,8 @@ import ( "github.com/TUM-Dev/gocast/model" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func ReportSeekRouterWrapper(r *gin.Engine) { diff --git a/api/statistics_test.go b/api/statistics_test.go index f13643777..041e9ffbf 100644 --- a/api/statistics_test.go +++ b/api/statistics_test.go @@ -12,8 +12,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" "gorm.io/gorm" ) diff --git a/api/stream_test.go b/api/stream_test.go index cf4c6a5d2..55ec12d5c 100644 --- a/api/stream_test.go +++ b/api/stream_test.go @@ -13,8 +13,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" "gorm.io/gorm" ) diff --git a/api/token_test.go b/api/token_test.go index 0a2088809..98c3214af 100644 --- a/api/token_test.go +++ b/api/token_test.go @@ -12,8 +12,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func TokenRouterWrapper(r *gin.Engine) { diff --git a/api/users_test.go b/api/users_test.go index 37ace3b5b..8f6629b34 100644 --- a/api/users_test.go +++ b/api/users_test.go @@ -13,8 +13,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" "gorm.io/gorm" ) diff --git a/api/worker_test.go b/api/worker_test.go index 2b967e980..2bac535b4 100644 --- a/api/worker_test.go +++ b/api/worker_test.go @@ -11,8 +11,8 @@ import ( "github.com/TUM-Dev/gocast/tools" "github.com/TUM-Dev/gocast/tools/testutils" "github.com/gin-gonic/gin" - "github.com/golang/mock/gomock" "github.com/matthiasreumann/gomino" + "go.uber.org/mock/gomock" ) func TestWorker(t *testing.T) { diff --git a/go.mod b/go.mod index 3c6be9da0..6e8e1f646 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,8 @@ module github.com/TUM-Dev/gocast -go 1.21 -toolchain go1.22.5 +go 1.22 + +toolchain go1.23.2 require ( github.com/RBG-TUM/CAMPUSOnline v0.0.0-20230412070523-8db58ed5c0b4 @@ -41,7 +42,7 @@ require ( github.com/crewjam/saml v0.4.14 github.com/golang/mock v1.6.0 github.com/icholy/digest v0.1.22 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 github.com/u2takey/go-utils v0.3.1 ) @@ -52,6 +53,7 @@ require ( github.com/matthiasreumann/gomino v0.0.2 github.com/meilisearch/meilisearch-go v0.26.0 github.com/orandin/slog-gorm v1.1.0 + go.uber.org/mock v0.5.0 ) require ( diff --git a/go.sum b/go.sum index ca33e8707..88fa484b8 100644 --- a/go.sum +++ b/go.sum @@ -297,8 +297,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -317,6 +318,8 @@ github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdI github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= diff --git a/go.work b/go.work index 71de48fe3..35914bd11 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,6 @@ -go 1.21 +go 1.22 + +toolchain go1.23.2 use ( . diff --git a/go.work.sum b/go.work.sum index aef7c4a00..fc85eccab 100644 --- a/go.work.sum +++ b/go.work.sum @@ -571,6 +571,8 @@ github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0b github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tdewolff/minify/v2 v2.12.4 h1:kejsHQMM17n6/gwdw53qsi6lg0TGddZADVyQOz1KMdE= github.com/tdewolff/parse/v2 v2.6.4 h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ= @@ -645,6 +647,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= @@ -654,6 +658,8 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= @@ -666,11 +672,15 @@ golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -680,7 +690,11 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk= +golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= @@ -689,8 +703,12 @@ golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -701,6 +719,8 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58 golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= diff --git a/tools/testutils/testdata.go b/tools/testutils/testdata.go index f0f5a106c..264f3f259 100644 --- a/tools/testutils/testdata.go +++ b/tools/testutils/testdata.go @@ -13,7 +13,7 @@ import ( "github.com/TUM-Dev/gocast/mock_tools" "github.com/TUM-Dev/gocast/model" "github.com/TUM-Dev/gocast/tools" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "gorm.io/gorm" )