Merge branch 'main' into feature/kino-api

TUM-Dev · Sep 20, 2023 · 9303296 · 9303296
2 parents 19b87b1 + 3304780
commit 9303296
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
       - APNS_KEY_ID=${APNS_KEY_ID}
       - APNS_TEAM_ID=${APNS_TEAM_ID}
       - APNS_P8_FILE_PATH=${APNS_P8_FILE_PATH}
-      - MensaCronDisabled=false
+      - MensaCronDisabled=true
       - OMDB_API_KEY=${OMDB_API_KEY}
       - CAMPUS_API_TOKEN=${CAMPUS_API_TOKEN}
     volumes:

diff --git a/server/backend/rpcserver.go b/server/backend/rpcserver.go
@@ -3,6 +3,7 @@ package backend
 import (
 	"context"
 	"errors"
+	"github.com/TUM-Dev/Campus-Backend/server/env"
 	"net"
 
 	pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
@@ -37,7 +38,9 @@ var _ pb.CampusServer = (*CampusServer)(nil)
 
 func New(db *gorm.DB) *CampusServer {
 	log.Trace("Server starting up")
-	initTagRatingOptions(db)
+	if env.IsMensaCronActive() {
+		initTagRatingOptions(db)
+	}
 
 	return &CampusServer{
 		db:                      db,