Merge branch 'main' into missing-dish-rating-fks

TUM-Dev · Mar 19, 2024 · a150b67 · a150b67
2 parents 104b037 + 6368cf0
commit a150b67
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/test_migration.yml b/.github/workflows/test_migration.yml
@@ -58,7 +58,7 @@ jobs:
         run: |
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) &&
           echo "local_to_auto<<$EOF" >> $GITHUB_OUTPUT &&
-          atlas schema diff --from "maria://root:super_secret_passw0rd@localhost:3306/campus_db" --to "maria://root:super_secret_passw0rd@localhost:3300/campus_db" --format '{{ sql . "  " }}' >> $GITHUB_OUTPUT &&
+          atlas schema diff --from "maria://root:super_secret_passw0rd@localhost:3300/campus_db" --to "maria://root:super_secret_passw0rd@localhost:3306/campus_db" --format '{{ sql . "  " }}' >> $GITHUB_OUTPUT &&
           echo "$EOF" >> $GITHUB_OUTPUT
           echo "auto_to_local<<$EOF" >> $GITHUB_OUTPUT &&
           atlas schema diff --from "maria://root:super_secret_passw0rd@localhost:3306/campus_db" --to "maria://root:super_secret_passw0rd@localhost:3300/campus_db" --format '{{ sql . "  " }}' >> $GITHUB_OUTPUT &&

diff --git a/server/backend/cron/dish_name_download.go b/server/backend/cron/dish_name_download.go
@@ -82,7 +82,9 @@ func downloadDailyDishes(c *CronService) {
 				"Name":       v.Name,
 				"StatusCode": resp.StatusCode,
 			}
-			log.WithError(err).WithFields(fields).Error("Menu does not exist")
+			// sometimes the eat-api does not have the required data.
+			// This might be because of a lot of factors, but most commonly no menu was posted for a certain week at the time of scraping
+			log.WithError(err).WithFields(fields).Info("Menu does not exist")
 			continue
 		}
 		var dishes CanteenDays

diff --git a/server/backend/migration/20240318000000.go b/server/backend/migration/20240318000000.go
@@ -2,6 +2,7 @@ package migration
 
 import (
 	"fmt"
+
 	"github.com/go-gormigrate/gormigrate/v2"
 	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"

diff --git a/server/backend/migration/20240319000000.go b/server/backend/migration/20240319000000.go
@@ -2,6 +2,7 @@ package migration
 
 import (
 	"fmt"
+
 	"github.com/go-gormigrate/gormigrate/v2"
 	"gorm.io/gorm"
 )

diff --git a/server/go.mod b/server/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/soheilhy/cmux v0.1.5
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/sync v0.6.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c
+	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
 	google.golang.org/grpc v1.62.1
 	google.golang.org/protobuf v1.33.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -52,7 +52,7 @@ require (
 	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/server/go.sum b/server/go.sum
@@ -466,8 +466,12 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c h1:kaI7oewGK5YnVwj+Y+EJBO/YN1ht8iTL9XkFHtVZLsc=
 google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c/go.mod h1:VQW3tUculP/D4B+xVCo+VgSq8As6wA9ZjHl//pmk+6s=
+google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 h1:RFiFrvy37/mpSpdySBDrUdipW/dHwsRwh3J3+A9VgT4=
+google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:lfpJ/2rWPa/kJgxyyXM8PrNnfCzcmxJ265mADgwmvLI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
 google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
 google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ package migration @@
     import (
     	"fmt"
     	"github.com/go-gormigrate/gormigrate/v2"
     	"gorm.io/gorm"
     )
@@ Expand Down @@