+
+
+
+`)
+ imdbID, err := parseImdbIDFromReader(reader)
+ if err != nil {
+ t.Error(err)
+ }
+ if imdbID != "tt10640346" {
+ t.Error("imdbID is not correct")
+ }
+}
diff --git a/server/backend/cron/new_exam_results_hook.go b/server/backend/cron/new_exam_results_hook.go
new file mode 100644
index 00000000..94a0dcfc
--- /dev/null
+++ b/server/backend/cron/new_exam_results_hook.go
@@ -0,0 +1,15 @@
+package cron
+
+import (
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/device"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/new_exam_results_hook/scheduling"
+)
+
+func (c *CronService) newExamResultsHookCron() error {
+ repo := scheduling.NewRepository(c.db)
+ devicesRepo := device.NewRepository(c.db)
+
+ service := scheduling.NewService(repo, devicesRepo, c.APNs)
+
+ return service.HandleScheduledCron()
+}
diff --git a/server/backend/cron/news.go b/server/backend/cron/news.go
index 02198907..8514c0b0 100644
--- a/server/backend/cron/news.go
+++ b/server/backend/cron/news.go
@@ -2,7 +2,6 @@ package cron
import (
"crypto/md5"
- "database/sql"
"errors"
"fmt"
"regexp"
@@ -18,9 +17,9 @@ import (
)
const (
- ImageDirectory = "news/newspread/"
- NewspreadHook = "newspread"
- ImpulsivHook = "impulsivHook"
+ NewsImageDirectory = "news/newspread/"
+ NewspreadHook = "newspread"
+ ImpulsivHook = "impulsivHook"
//MAX_IMAGE_RETRYS = 3
)
@@ -88,42 +87,47 @@ func (c *CronService) parseNewsFeed(source model.NewsSource) error {
}
}
- if !skipNews(existingNewsLinksForSource, item.Link) {
- // pick the first enclosure that is an image (if any)
- var pickedEnclosure *gofeed.Enclosure
- var enclosureUrl = null.String{NullString: sql.NullString{Valid: true, String: ""}}
- for _, enclosure := range item.Enclosures {
- if strings.HasSuffix(enclosure.URL, "jpg") ||
- strings.HasSuffix(enclosure.URL, "jpeg") ||
- strings.HasSuffix(enclosure.URL, "png") ||
- ImageContentTypeRegex.MatchString(enclosure.Type) {
- pickedEnclosure = enclosure
- break
- }
+ if skipNews(existingNewsLinksForSource, item.Link) {
+ continue
+ }
+
+ // pick the first enclosure that is an image (if any)
+ var pickedEnclosure *gofeed.Enclosure
+ for _, enclosure := range item.Enclosures {
+ if strings.HasSuffix(enclosure.URL, "jpg") ||
+ strings.HasSuffix(enclosure.URL, "jpeg") ||
+ strings.HasSuffix(enclosure.URL, "png") ||
+ ImageContentTypeRegex.MatchString(enclosure.Type) {
+ pickedEnclosure = enclosure
+ break
}
- var fileId = null.Int{NullInt64: sql.NullInt64{Valid: false}}
- if pickedEnclosure != nil {
- fileId, err = c.saveImage(pickedEnclosure.URL)
- if err != nil {
- log.WithError(err).Error("can't save news image")
- }
- enclosureUrl = null.String{NullString: sql.NullString{String: pickedEnclosure.URL, Valid: true}}
+ }
+ var enclosureUrl = null.StringFrom("")
+ var file *model.File
+ var fileID null.Int
+ if pickedEnclosure != nil {
+ file, err = c.saveImage(pickedEnclosure.URL)
+ if err != nil {
+ log.WithError(err).WithField("url", pickedEnclosure.URL).Error("can't save news image")
+ } else {
+ fileID = null.IntFrom(file.File)
}
- bm := bluemonday.StrictPolicy()
- sanitizedDesc := bm.Sanitize(item.Description)
+ enclosureUrl = null.StringFrom(pickedEnclosure.URL)
+ }
- newsItem := model.News{
- Date: *item.PublishedParsed,
- Created: time.Now(),
- Title: item.Title,
- Description: sanitizedDesc,
- Src: source.Source,
- Link: item.Link,
- Image: enclosureUrl,
- File: fileId,
- }
- newNews = append(newNews, newsItem)
+ newsItem := model.News{
+ Date: *item.PublishedParsed,
+ Created: time.Now(),
+ Title: item.Title,
+ Description: bluemonday.StrictPolicy().Sanitize(item.Description),
+ NewsSourceID: source.Source,
+ NewsSource: source,
+ Link: item.Link,
+ Image: enclosureUrl,
+ FileID: fileID,
+ File: file,
}
+ newNews = append(newNews, newsItem)
}
if ammountOfNewNews := len(newNews); ammountOfNewNews != 0 {
err = c.db.Save(&newNews).Error
@@ -137,39 +141,30 @@ func (c *CronService) parseNewsFeed(source model.NewsSource) error {
return nil
}
-// saveImage Saves an image to the database so it can be downloaded by another cronjob and returns its id
-func (c *CronService) saveImage(url string) (null.Int, error) {
+// saveImage saves an image to the database, so it can be downloaded by another cronjob and returns its id
+func (c *CronService) saveImage(url string) (*model.File, error) {
targetFileName := fmt.Sprintf("%x.jpg", md5.Sum([]byte(url)))
- var fileId null.Int
- if err := c.db.Model(model.Files{}).
- Where("name = ?", targetFileName).
- Select("file").Scan(&fileId).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ var file model.File
+ // path intentionally omitted in query to allow for deduplication
+ if err := c.db.First(&file, "name = ?", targetFileName).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
log.WithError(err).WithField("targetFileName", targetFileName).Error("Couldn't query database for file")
- return null.Int{}, err
- }
- if fileId.Valid { // file already in database -> return for current news.
- return fileId, nil
+ return nil, err
+ } else if err == nil {
+ return &file, nil
}
- // otherwise store in database:
- file := model.Files{
+ // does not exist, store in database
+ file = model.File{
Name: targetFileName,
- Path: ImageDirectory,
- URL: sql.NullString{String: url, Valid: true},
- Downloaded: sql.NullBool{Bool: false, Valid: true},
+ Path: NewsImageDirectory,
+ URL: null.StringFrom(url),
+ Downloaded: null.BoolFrom(false),
}
- err := c.db.Transaction(func(tx *gorm.DB) error {
- if err := tx.Create(&file).Error; err != nil {
- log.WithError(err).Error("Could not store new file to database")
- return err
- }
- return nil
- })
- if err != nil {
- return null.Int{}, err
+ if err := c.db.Create(&file).Error; err != nil {
+ log.WithError(err).Error("Could not store new file to database")
+ return nil, err
}
- // creating this int is annoying but i'm too afraid to use real ORM in the model
- return null.Int{NullInt64: sql.NullInt64{Int64: int64(file.File), Valid: true}}, nil
+ return &file, nil
}
// skipNews returns true if link is in existingLinks or link is invalid
@@ -185,7 +180,7 @@ func skipNews(existingLinks []string, link string) bool {
return false
}
-func (c *CronService) cleanOldNewsForSource(source int32) error {
+func (c *CronService) cleanOldNewsForSource(source int64) error {
log.WithField("source", source).Trace("Truncating old entries")
if res := c.db.Delete(&model.News{}, "`src` = ? AND `created` < ?", source, time.Now().Add(time.Hour*24*365*-1)); res.Error == nil {
log.WithField("RowsAffected", res.RowsAffected).Info("cleaned up old news")
@@ -205,7 +200,6 @@ func (c *CronService) newspreadHook(item *gofeed.Item) {
extractedImageURL = extractedImageSlice[0]
}
item.Enclosures = []*gofeed.Enclosure{{URL: extractedImageURL}}
- item.Link = extractedImageURL
item.Description = ""
}
diff --git a/server/backend/cron/roomfinder.go b/server/backend/cron/roomfinder.go
deleted file mode 100644
index af68f7e4..00000000
--- a/server/backend/cron/roomfinder.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package cron
-
-//lint:ignore U1000 stub
-func (c *CronService) roomFinderCron() error {
- // TODO: implement
- return nil
-}
diff --git a/server/backend/device.go b/server/backend/device.go
index 0250f4e7..b580a4e0 100644
--- a/server/backend/device.go
+++ b/server/backend/device.go
@@ -18,23 +18,22 @@ import (
// deviceBuffer stores all recent device calls in a buffer and flushes them to the database periodically
type deviceBuffer struct {
- lock sync.Mutex
- devices map[string]*model.Devices // key is uuid
- interval time.Duration // flush interval
+ lock sync.Mutex
+ devices map[string]*model.Devices // key is uuid
}
func newDeviceBuffer() *deviceBuffer {
return &deviceBuffer{
- lock: sync.Mutex{},
- devices: make(map[string]*model.Devices),
- interval: time.Minute,
+ lock: sync.Mutex{},
+ devices: make(map[string]*model.Devices),
}
-
}
+const FlushingInterval = time.Minute
+
func (s *CampusServer) RunDeviceFlusher() error {
for {
- time.Sleep(s.deviceBuf.interval)
+ time.Sleep(FlushingInterval)
if err := s.deviceBuf.flush(s.db); err != nil {
log.WithError(err).Error("Error flushing device buffer")
}
@@ -124,26 +123,26 @@ func (s *CampusServer) checkDevice(ctx context.Context) error {
return nil
}
-func (s *CampusServer) RegisterDevice(_ context.Context, req *pb.RegisterDeviceRequest) (*pb.RegisterDeviceReply, error) {
- if err := ValidateRegisterDevice(req); err != nil {
+func (s *CampusServer) CreateDevice(_ context.Context, req *pb.CreateDeviceRequest) (*pb.CreateDeviceReply, error) {
+ if err := ValidateCreateDevice(req); err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
switch req.GetDeviceType() {
case pb.DeviceType_ANDROID:
- return nil, status.Error(codes.Unimplemented, "android device register not implemented")
+ return nil, status.Error(codes.Unimplemented, "android device creation not implemented")
case pb.DeviceType_IOS:
service := s.GetIOSDeviceService()
- return service.RegisterDevice(req)
+ return service.CreateDevice(req)
case pb.DeviceType_WINDOWS:
- return nil, status.Error(codes.Unimplemented, "windows device register not implemented")
+ return nil, status.Error(codes.Unimplemented, "windows device creation not implemented")
}
return nil, status.Error(codes.InvalidArgument, "invalid device type")
}
-func (s *CampusServer) RemoveDevice(_ context.Context, req *pb.RemoveDeviceRequest) (*pb.RemoveDeviceReply, error) {
- if err := ValidateRemoveDevice(req); err != nil {
+func (s *CampusServer) DeleteDevice(_ context.Context, req *pb.DeleteDeviceRequest) (*pb.DeleteDeviceReply, error) {
+ if err := ValidateDeleteDevice(req); err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
@@ -152,7 +151,7 @@ func (s *CampusServer) RemoveDevice(_ context.Context, req *pb.RemoveDeviceReque
return nil, status.Error(codes.Unimplemented, "android device remove not implemented")
case pb.DeviceType_IOS:
service := s.GetIOSDeviceService()
- return service.RemoveDevice(req)
+ return service.DeleteDevice(req)
case pb.DeviceType_WINDOWS:
return nil, status.Error(codes.Unimplemented, "windows device remove not implemented")
}
diff --git a/server/backend/feedback.go b/server/backend/feedback.go
new file mode 100644
index 00000000..8cc3cb22
--- /dev/null
+++ b/server/backend/feedback.go
@@ -0,0 +1,160 @@
+package backend
+
+import (
+ "bytes"
+ "fmt"
+ "io"
+ "os"
+ "path"
+ "slices"
+
+ pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/cron"
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ "github.com/gabriel-vasile/mimetype"
+ "github.com/gofrs/uuid/v5"
+ "github.com/guregu/null"
+ log "github.com/sirupsen/logrus"
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
+ "gorm.io/gorm"
+)
+
+// CreateFeedback accepts a stream of feedback messages from the client and stores them in the database/file system.
+func (s *CampusServer) CreateFeedback(stream pb.Campus_CreateFeedbackServer) error {
+ // receive metadata
+ id, err := uuid.NewGen().NewV4()
+ if err != nil {
+ log.WithError(err).Error("Error generating uuid")
+ return status.Error(codes.Internal, "Error starting feedback submission")
+ }
+ feedback := &model.Feedback{EmailId: null.StringFrom(id.String())}
+
+ // download images
+ dbPath := path.Join("feedback", feedback.EmailId.String)
+ var uploadedFilenames []*string
+ for {
+ req, err := stream.Recv()
+ if err == io.EOF {
+ break
+ }
+ if err != nil {
+ log.WithError(err).Error("Error receiving feedback")
+ deleteUploaded(feedback.EmailId.String)
+ return status.Error(codes.Internal, "Error receiving feedback")
+ }
+ mergeFeedback(feedback, req)
+
+ if len(req.Attachment) > 0 {
+ filename := handleImageUpload(req.Attachment, len(uploadedFilenames), dbPath)
+ if filename != nil {
+ uploadedFilenames = append(uploadedFilenames, filename)
+ }
+ }
+ }
+ feedback.ImageCount = int32(len(uploadedFilenames))
+ // save feedback to db
+ if err := s.db.WithContext(stream.Context()).Transaction(func(tx *gorm.DB) error {
+ for _, filename := range uploadedFilenames {
+ if err := tx.Create(&model.File{
+ Name: *filename,
+ Path: dbPath,
+ Downloads: 1,
+ Downloaded: null.BoolFrom(true),
+ }).Error; err != nil {
+ return err
+ }
+ }
+ return tx.Create(feedback).Error
+ }); err != nil {
+ log.WithError(err).Error("Error creating feedback")
+ deleteUploaded(feedback.EmailId.String)
+ return status.Error(codes.Internal, "Error creating feedback")
+ }
+
+ if err := stream.SendAndClose(&pb.CreateFeedbackReply{}); err != nil {
+ log.WithError(err).Error("Error sending feedback-reply")
+ return status.Error(codes.Internal, "Error sending feedback-reply")
+ }
+ return nil
+}
+
+// deleteUploaded deletes all uploaded images from the filesystem
+func deleteUploaded(dbPath string) {
+ if err := os.RemoveAll(cron.StorageDir + dbPath); err != nil {
+ log.WithError(err).WithField("path", dbPath).Error("Error deleting uploaded images from filesystem")
+ }
+}
+
+func handleImageUpload(content []byte, imageCounter int, dbPath string) *string {
+ filename, realFilePath := inferFileName(mimetype.Detect(content), dbPath, imageCounter)
+ if filename == nil {
+ return nil // the filetype is not accepted by us
+ }
+
+ if err := os.MkdirAll(path.Dir(*realFilePath), 0755); err != nil {
+ log.WithError(err).WithField("dbPath", dbPath).Error("Error creating directory for feedback")
+ return nil
+ }
+ out, err := os.Create(*realFilePath)
+ if err != nil {
+ log.WithError(err).WithField("path", dbPath).Error("Error creating file for feedback")
+ return nil
+ }
+ defer func(out *os.File) {
+ err := out.Close()
+ if err != nil {
+ log.WithError(err).WithField("path", dbPath).Error("Error while closing file")
+ }
+ }(out)
+ if _, err := io.Copy(out, bytes.NewReader(content)); err != nil {
+ log.WithError(err).WithField("path", dbPath).Error("Error while writing file")
+ if err := os.Remove(*realFilePath); err != nil {
+ log.WithError(err).WithField("path", dbPath).Warn("Could not clean up file")
+ }
+ return nil
+ }
+ return filename
+}
+
+func inferFileName(mime *mimetype.MIME, dbPath string, counter int) (*string, *string) {
+ allowedExt := []string{".jpeg", ".jpg", ".png", ".webp", ".md", ".txt", ".pdf"}
+ if !slices.Contains(allowedExt, mime.Extension()) {
+ return nil, nil
+ }
+
+ filename := fmt.Sprintf("%d%s", counter, mime.Extension())
+ realFilePath := path.Join(cron.StorageDir, dbPath, filename)
+ return &filename, &realFilePath
+}
+
+func mergeFeedback(feedback *model.Feedback, req *pb.CreateFeedbackRequest) {
+ if req.Recipient.Enum() != nil {
+ feedback.Recipient = null.StringFrom(receiverFromTopic(req.Recipient))
+ }
+ if req.OsVersion != "" {
+ feedback.OsVersion = null.StringFrom(req.OsVersion)
+ }
+ if req.AppVersion != "" {
+ feedback.AppVersion = null.StringFrom(req.AppVersion)
+ }
+ if req.Location != nil {
+ feedback.Longitude = null.FloatFrom(req.Location.Longitude)
+ feedback.Latitude = null.FloatFrom(req.Location.Latitude)
+ }
+ if req.Message != "" {
+ feedback.Feedback = null.StringFrom(req.Message)
+ }
+ if req.FromEmail != "" {
+ feedback.ReplyTo = null.StringFrom(req.FromEmail)
+ }
+}
+
+func receiverFromTopic(topic pb.CreateFeedbackRequest_Recipient) string {
+ switch topic {
+ case pb.CreateFeedbackRequest_TUM_DEV:
+ return "app@tum.de"
+ default:
+ return "kontakt@tum.de"
+ }
+}
diff --git a/server/backend/feedback_test.go b/server/backend/feedback_test.go
new file mode 100644
index 00000000..550143c9
--- /dev/null
+++ b/server/backend/feedback_test.go
@@ -0,0 +1,191 @@
+package backend
+
+import (
+ "bytes"
+ "context"
+ "database/sql"
+ "image"
+ "image/png"
+ "io"
+ "os"
+ "path"
+ "regexp"
+ "testing"
+ "time"
+
+ "github.com/TUM-Dev/Campus-Backend/server/backend/cron"
+
+ "github.com/DATA-DOG/go-sqlmock"
+ pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
+ "github.com/stretchr/testify/require"
+ "github.com/stretchr/testify/suite"
+ "google.golang.org/grpc"
+ "gorm.io/driver/mysql"
+ "gorm.io/gorm"
+)
+
+type FeedbackSuite struct {
+ suite.Suite
+ DB *gorm.DB
+ mock sqlmock.Sqlmock
+}
+
+func (s *FeedbackSuite) SetupSuite() {
+ var (
+ db *sql.DB
+ err error
+ )
+
+ db, s.mock, err = sqlmock.New()
+ require.NoError(s.T(), err)
+
+ dialector := mysql.New(mysql.Config{
+ Conn: db,
+ DriverName: "mysql",
+ })
+ s.mock.ExpectQuery("SELECT VERSION()").
+ WillReturnRows(sqlmock.NewRows([]string{"VERSION()"}).AddRow("10.11.4-MariaDB"))
+ s.DB, err = gorm.Open(dialector, &gorm.Config{})
+ require.NoError(s.T(), err)
+}
+
+type mockedFeedbackStream struct {
+ grpc.ServerStream
+ recived []*pb.CreateFeedbackRequest
+ reply *pb.CreateFeedbackReply
+ T *testing.T
+}
+
+func (f mockedFeedbackStream) SendAndClose(reply *pb.CreateFeedbackReply) error {
+ require.Equal(f.T, f.reply, reply)
+ return nil
+}
+
+// because of the way the mocked stream works, we need to keep track of the index
+// we however can't track this inside of mockedFeedbackStream, as we cannot mutate the struct
+// => tracking this as a global variable is the only way
+var index = uint(0)
+
+func (f mockedFeedbackStream) Recv() (*pb.CreateFeedbackRequest, error) {
+ if int(index) >= len(f.recived) {
+ return nil, io.EOF
+ }
+ index++
+ return f.recived[index-1], nil
+}
+
+func (f mockedFeedbackStream) Context() context.Context {
+ // reset index, as this function is called before Recv()
+ // This is a hacky solution, but it works
+ index = 0
+ return context.Background()
+}
+
+// createDummyImage creates a dummy image with the specified dimensions
+func createDummyImage(t *testing.T, width, height int) []byte {
+ img := image.NewRGBA(image.Rect(0, 0, width, height))
+ // encode img to buffer
+ buf := new(bytes.Buffer)
+ require.NoError(t, png.Encode(buf, img))
+ return buf.Bytes()
+}
+
+func (s *FeedbackSuite) Test_CreateFeedback_OneFile() {
+ cron.StorageDir = "test_one_image/"
+ defer func(path string) {
+ err := os.RemoveAll(path)
+ if err != nil {
+ s.T().Fatal(err)
+ }
+ }(cron.StorageDir)
+
+ server := CampusServer{db: s.DB}
+ s.mock.ExpectBegin()
+ returnedTime := time.Now()
+ s.mock.ExpectQuery(regexp.QuoteMeta("INSERT INTO `files` (`name`,`path`,`downloads`,`downloaded`) VALUES (?,?,?,?) RETURNING `url`,`file`")).
+ WithArgs("0.txt", sqlmock.AnyArg(), 1, true).
+ WillReturnRows(sqlmock.NewRows([]string{"url", "file"}).AddRow(nil, 1))
+ s.mock.ExpectQuery(regexp.QuoteMeta("INSERT INTO `files` (`name`,`path`,`downloads`,`downloaded`) VALUES (?,?,?,?) RETURNING `url`,`file`")).
+ WithArgs("1.png", sqlmock.AnyArg(), 1, true).
+ WillReturnRows(sqlmock.NewRows([]string{"url", "file"}).AddRow(nil, 1))
+ s.mock.ExpectQuery(regexp.QuoteMeta("INSERT INTO `feedback` (`image_count`,`email_id`,`receiver`,`reply_to`,`feedback`,`latitude`,`longitude`,`os_version`,`app_version`,`processed`) VALUES (?,?,?,?,?,?,?,?,?,?) RETURNING `timestamp`,`id`")).
+ WithArgs(2, sqlmock.AnyArg(), "app@tum.de", "testing@example.com", "Hello World", nil, nil, nil, nil, false).
+ WillReturnRows(sqlmock.NewRows([]string{"timestamp", "id"}).AddRow(returnedTime, 1))
+ s.mock.ExpectCommit()
+
+ dummyImage := createDummyImage(s.T(), 10, 10)
+ dummyText := []byte("Dummy Text")
+ stream := mockedFeedbackStream{
+ T: s.T(),
+ recived: []*pb.CreateFeedbackRequest{
+ {Recipient: pb.CreateFeedbackRequest_TUM_DEV, FromEmail: "testing@example.com", Message: "Hello World", Attachment: dummyText},
+ {Attachment: dummyImage},
+ },
+ reply: &pb.CreateFeedbackReply{},
+ }
+ require.NoError(s.T(), server.CreateFeedback(stream))
+
+ // check that the correct operations happened to the file system
+ files := extractUploadedFiles(s.T(), cron.StorageDir, 2)
+ expectFileMatches(s.T(), (*files)[0], "0.txt", returnedTime, dummyText)
+ expectFileMatches(s.T(), (*files)[1], "1.png", returnedTime, dummyImage)
+}
+
+func expectFileMatches(t *testing.T, file os.DirEntry, name string, returnedTime time.Time, content []byte) {
+ require.Equal(t, name, file.Name())
+ require.True(t, file.Type().IsRegular())
+ info, err := file.Info()
+ require.NoError(t, err)
+ require.LessOrEqual(t, returnedTime.Unix(), info.ModTime().Unix())
+ require.Len(t, content, int(info.Size()))
+}
+
+func (s *FeedbackSuite) Test_CreateFeedback_NoImage() {
+ cron.StorageDir = "test_no_image/"
+
+ server := CampusServer{db: s.DB}
+ s.mock.ExpectBegin()
+ s.mock.ExpectQuery(regexp.QuoteMeta("INSERT INTO `feedback` (`image_count`,`email_id`,`receiver`,`reply_to`,`feedback`,`latitude`,`longitude`,`os_version`,`app_version`,`processed`) VALUES (?,?,?,?,?,?,?,?,?,?) RETURNING `timestamp`,`id`")).
+ WithArgs(0, sqlmock.AnyArg(), "app@tum.de", "testing@example.com", "Hello World", nil, nil, nil, nil, false).
+ WillReturnRows(sqlmock.NewRows([]string{"timestamp", "id"}).AddRow(time.Now(), 1))
+ s.mock.ExpectCommit()
+
+ stream := mockedFeedbackStream{
+ T: s.T(),
+ recived: []*pb.CreateFeedbackRequest{
+ {Recipient: pb.CreateFeedbackRequest_TUM_DEV, FromEmail: "testing@example.com", Message: "Hello World"},
+ {}, // empty images should be ignored
+ },
+ reply: &pb.CreateFeedbackReply{},
+ }
+ require.NoError(s.T(), server.CreateFeedback(stream))
+
+ // no image should be uploaded to the file system
+ extractUploadedFiles(s.T(), cron.StorageDir, 0)
+}
+
+func extractUploadedFiles(t *testing.T, storageRoot string, expected int) *[]os.DirEntry {
+ parentDir, err := os.ReadDir(path.Join(storageRoot, "feedback"))
+ if expected == 0 {
+ require.Error(t, err, os.ErrNotExist.Error())
+ require.Empty(t, parentDir)
+ return nil
+ }
+
+ require.NoError(t, err)
+ require.Len(t, parentDir, 1)
+ dir, err := os.ReadDir(path.Join(storageRoot, "feedback", parentDir[0].Name()))
+ require.NoError(t, err)
+ require.Len(t, dir, expected)
+ return &dir
+}
+
+func (s *FeedbackSuite) AfterTest(_, _ string) {
+ require.NoError(s.T(), s.mock.ExpectationsWereMet())
+}
+
+// In order for 'go test' to run this suite, we need to create
+// a normal test function and pass our suite to suite.Run
+func TestExampleTestSuite(t *testing.T) {
+ suite.Run(t, new(FeedbackSuite))
+}
diff --git a/server/backend/firebase/messaging.go b/server/backend/firebase/messaging.go
deleted file mode 100644
index 4d2f909e..00000000
--- a/server/backend/firebase/messaging.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package firebase
-
-import "gorm.io/gorm"
-
-type MessagingService struct {
- db *gorm.DB
-}
-
-func New(db *gorm.DB) *MessagingService {
-
- return &MessagingService{db: db}
-}
-
-func (c *MessagingService) Run() error {
-
- return nil
-}
diff --git a/server/backend/influx/influxClient.go b/server/backend/influx/influxClient.go
deleted file mode 100644
index afb985d6..00000000
--- a/server/backend/influx/influxClient.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Package influx provides a handy wrapper around the influxdb client
-package influx
-
-import (
- "crypto/sha256"
- "encoding/hex"
- "errors"
- "os"
-
- "github.com/TUM-Dev/Campus-Backend/server/env"
- influxdb2 "github.com/influxdata/influxdb-client-go/v2"
- "github.com/influxdata/influxdb-client-go/v2/api"
- "github.com/influxdata/influxdb-client-go/v2/api/write"
- log "github.com/sirupsen/logrus"
-)
-
-var (
- influxOrg = os.Getenv("INFLUXDB_ORG")
- influxBucket = os.Getenv("INFLUXDB_BUCKET")
-
- ErrInfluxClientNotConfigured = errors.New("influx client not configured")
-)
-
-var Client *influxdb2.Client
-
-func GetClient() influxdb2.Client {
- return *Client
-}
-
-func SetClient(client *influxdb2.Client) {
- Client = client
-}
-
-func hashSha256(s string) string {
- h := sha256.New()
-
- h.Write([]byte(s))
-
- return hex.EncodeToString(h.Sum(nil))
-}
-
-func LogPoint(p *write.Point) {
- w, err := writeAPI()
-
- if err != nil {
- log.Warn("could not log because influx client is not configured")
- return
- }
-
- w.WritePoint(p)
-
- flushIfDevelop(w)
-}
-
-func flushIfDevelop(write api.WriteAPI) {
- if env.IsDev() {
- write.Flush()
- }
-}
-
-func writeAPI() (api.WriteAPI, error) {
- if Client != nil {
- return GetClient().WriteAPI(influxOrg, influxBucket), nil
- }
-
- return nil, ErrInfluxClientNotConfigured
-}
diff --git a/server/backend/influx/iosLogging.go b/server/backend/influx/iosLogging.go
deleted file mode 100644
index 5183d957..00000000
--- a/server/backend/influx/iosLogging.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package influx
-
-import influxdb2 "github.com/influxdata/influxdb-client-go/v2"
-
-func LogIOSRegisterDevice(deviceId string) {
- hashedDeviceId := hashSha256(deviceId)
-
- p := influxdb2.NewPointWithMeasurement("ios_register_device").
- AddTag("device_id", hashedDeviceId)
-
- LogPoint(p)
-}
-
-func LogIOSRemoveDevice(deviceId string) {
- hashedDeviceId := hashSha256(deviceId)
-
- p := influxdb2.NewPointWithMeasurement("ios_remove_device").
- AddTag("device_id", hashedDeviceId)
-
- LogPoint(p)
-}
-
-func LogIOSNewGrades(deviceId string, gradesCount int) {
- hashedDeviceId := hashSha256(deviceId)
-
- p := influxdb2.NewPointWithMeasurement("ios_new_grades").
- AddTag("device_id", hashedDeviceId).
- AddField("new_grades_count", gradesCount)
-
- LogPoint(p)
-}
-
-func LogIOSSchedulingDevicesToUpdate(devicesToUpdateCount int, priority int) {
- p := influxdb2.NewPointWithMeasurement("ios_scheduling_devices_to_update").
- AddTag("priority", string(rune(priority))).
- AddField("devices_to_update", devicesToUpdateCount)
-
- LogPoint(p)
-}
-
-func LogIOSBackgroundRequest(deviceId, requestType, reason string) {
- hashedDeviceId := hashSha256(deviceId)
-
- p := influxdb2.NewPointWithMeasurement("ios_campus_token_request").
- AddTag("device_id", hashedDeviceId).
- AddField("request_type", requestType).
- AddField("notification_reason_response", reason)
-
- LogPoint(p)
-}
-
-func LogIOSBackgroundRequestResponse(deviceId, requestType string) {
- hashedDeviceId := hashSha256(deviceId)
-
- p := influxdb2.NewPointWithMeasurement("ios_campus_token_response").
- AddTag("device_id", hashedDeviceId).
- AddField("request_type", requestType)
-
- LogPoint(p)
-}
diff --git a/server/backend/influxdb.go b/server/backend/influxdb.go
deleted file mode 100644
index 28ae23d9..00000000
--- a/server/backend/influxdb.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package backend
-
-import (
- "context"
- "errors"
- "os"
-
- "github.com/TUM-Dev/Campus-Backend/server/backend/influx"
- influxdb2 "github.com/influxdata/influxdb-client-go/v2"
-)
-
-const (
- // InfluxBatchSize is the number of points that are sent to influxdb at once
- // This is to reduce the number of requests to the database
- InfluxBatchSize = 500
-)
-
-var (
- influxToken = os.Getenv("INFLUXDB_TOKEN")
- influxURL = os.Getenv("INFLUXDB_URL")
-
- ErrInfluxTokenNotConfigured = errors.New("influxdb token not configured")
- ErrInfluxURLNotConfigured = errors.New("influxdb url not configured")
-)
-
-func ConnectToInfluxDB() error {
- if influxToken == "" {
- return ErrInfluxTokenNotConfigured
- }
-
- if influxURL == "" {
- return ErrInfluxURLNotConfigured
- }
-
- client := influxdb2.NewClientWithOptions(influxURL, influxToken,
- influxdb2.DefaultOptions().SetBatchSize(InfluxBatchSize))
-
- influx.SetClient(&client)
-
- _, err := influx.GetClient().Health(context.Background())
-
- return err
-}
diff --git a/server/backend/iosNotifications.go b/server/backend/iosNotifications.go
deleted file mode 100644
index bc759e92..00000000
--- a/server/backend/iosNotifications.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package backend
-
-import (
- "context"
-
- pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns/ios_apns_jwt"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_device"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_request_response"
- "gorm.io/gorm"
-)
-
-type IOSNotificationsService struct {
- DB *gorm.DB
- APNSToken *ios_apns_jwt.Token
- IsActive bool
-}
-
-func (s *CampusServer) GetIOSDeviceService() *ios_device.Service {
- repository := ios_device.NewRepository(s.db)
-
- return ios_device.NewService(repository)
-}
-
-func (s *CampusServer) GetIOSAPNsService() *ios_apns.Service {
- repository := ios_apns.NewRepository(s.db, s.GetIOSNotificationsService().APNSToken)
-
- return ios_apns.NewService(repository)
-}
-
-func (s *CampusServer) GetIOSRequestResponseService() *ios_request_response.Service {
- repository := ios_request_response.NewRepository(s.db, s.GetIOSNotificationsService().APNSToken)
-
- return ios_request_response.NewService(repository)
-}
-
-func (s *CampusServer) IOSDeviceRequestResponse(_ context.Context, req *pb.IOSDeviceRequestResponseRequest) (*pb.IOSDeviceRequestResponseReply, error) {
- service := s.GetIOSRequestResponseService()
- return service.HandleDeviceRequestResponse(req, s.iOSNotificationsService.IsActive)
-}
diff --git a/server/backend/ios_notifications.go b/server/backend/ios_notifications.go
new file mode 100644
index 00000000..392997fd
--- /dev/null
+++ b/server/backend/ios_notifications.go
@@ -0,0 +1,40 @@
+package backend
+
+import (
+ "context"
+
+ pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/apns"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/device"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/request_response"
+ "gorm.io/gorm"
+)
+
+type IOSNotificationsService struct {
+ DB *gorm.DB
+ APNSToken *apns.JWTToken
+ IsActive bool
+}
+
+func (s *CampusServer) GetIOSDeviceService() *device.Service {
+ repository := device.NewRepository(s.db)
+
+ return device.NewService(repository)
+}
+
+func (s *CampusServer) GetIOSAPNsService() *apns.Service {
+ repository := apns.NewRepository(s.db, s.GetIOSNotificationsService().APNSToken)
+
+ return apns.NewService(repository)
+}
+
+func (s *CampusServer) GetIOSRequestResponseService() *request_response.Service {
+ repository := request_response.NewRepository(s.db, s.GetIOSNotificationsService().APNSToken)
+
+ return request_response.NewService(repository)
+}
+
+func (s *CampusServer) IOSDeviceRequestResponse(_ context.Context, req *pb.IOSDeviceRequestResponseRequest) (*pb.IOSDeviceRequestResponseReply, error) {
+ service := s.GetIOSRequestResponseService()
+ return service.HandleDeviceRequestResponse(req, s.iOSNotificationsService.IsActive)
+}
diff --git a/server/backend/ios_notifications/ios_apns/ios_apns_jwt/iosAPNsToken.go b/server/backend/ios_notifications/apns/jwt_token.go
similarity index 89%
rename from server/backend/ios_notifications/ios_apns/ios_apns_jwt/iosAPNsToken.go
rename to server/backend/ios_notifications/apns/jwt_token.go
index cb9cecd3..45d0dfc0 100644
--- a/server/backend/ios_notifications/ios_apns/ios_apns_jwt/iosAPNsToken.go
+++ b/server/backend/ios_notifications/apns/jwt_token.go
@@ -1,5 +1,5 @@
-// Package ios_apns_jwt handles the generation and validation of the JWT token for the APNs service
-package ios_apns_jwt
+// Package apns handles the generation and validation of the JWT token for the APNs service
+package apns
import (
"crypto/ecdsa"
@@ -29,7 +29,7 @@ var (
ApnsP8FilePath = os.Getenv("APNS_P8_FILE_PATH")
)
-type Token struct {
+type JWTToken struct {
sync.Mutex
EncryptionKey *ecdsa.PrivateKey
KeyId string
@@ -38,13 +38,13 @@ type Token struct {
Bearer string
}
-func NewToken() (*Token, error) {
+func NewToken() (*JWTToken, error) {
encryptionKey, err := APNsEncryptionKeyFromFile()
if err != nil {
return nil, err
}
- token := Token{
+ token := JWTToken{
EncryptionKey: encryptionKey,
KeyId: ApnsKeyId,
TeamId: ApnsTeamId,
@@ -99,7 +99,7 @@ func APNsEncryptionKeyFromFile() (*ecdsa.PrivateKey, error) {
return nil, ErrorAuthKeyNotEcdsa
}
-func (t *Token) GenerateNewTokenIfExpired() (bearer string) {
+func (t *JWTToken) GenerateNewTokenIfExpired() (bearer string) {
t.Lock()
defer t.Unlock()
@@ -113,11 +113,11 @@ func (t *Token) GenerateNewTokenIfExpired() (bearer string) {
return t.Bearer
}
-func (t *Token) IsExpired() bool {
+func (t *JWTToken) IsExpired() bool {
return currentTimestamp() >= (t.IssuedAt + TokenTimeout)
}
-func (t *Token) Generate() error {
+func (t *JWTToken) Generate() error {
if t.EncryptionKey == nil {
return ErrorAuthKeyNil
}
diff --git a/server/backend/ios_notifications/ios_apns/iosAPNsRepository.go b/server/backend/ios_notifications/apns/repository.go
similarity index 91%
rename from server/backend/ios_notifications/ios_apns/iosAPNsRepository.go
rename to server/backend/ios_notifications/apns/repository.go
index 3108b090..41d905d6 100644
--- a/server/backend/ios_notifications/ios_apns/iosAPNsRepository.go
+++ b/server/backend/ios_notifications/apns/repository.go
@@ -1,4 +1,4 @@
-package ios_apns
+package apns
import (
"bytes"
@@ -9,7 +9,6 @@ import (
"strconv"
"time"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns/ios_apns_jwt"
"github.com/TUM-Dev/Campus-Backend/server/env"
"github.com/TUM-Dev/Campus-Backend/server/model"
log "github.com/sirupsen/logrus"
@@ -38,7 +37,7 @@ var (
type Repository struct {
DB gorm.DB
- Token *ios_apns_jwt.Token
+ Token *JWTToken
httpClient *http.Client
}
@@ -48,7 +47,6 @@ func (r *Repository) ApnsUrl() string {
if env.IsProd() {
return ApnsProductionURL
}
-
return ApnsDevelopmentURL
}
@@ -87,7 +85,6 @@ func (r *Repository) SendNotification(notification *model.IOSNotificationPayload
url := r.ApnsUrl() + "/3/device/" + notification.DeviceId
body, _ := notification.MarshalJSON()
- client := r.httpClient
req, _ := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(body))
// can be e.g. alert or background
@@ -99,7 +96,7 @@ func (r *Repository) SendNotification(notification *model.IOSNotificationPayload
bearer := r.Token.GenerateNewTokenIfExpired()
req.Header.Set("authorization", "bearer "+bearer)
- resp, err := client.Do(req)
+ resp, err := r.httpClient.Do(req)
if err != nil {
log.WithError(err).Error("Could not send notification")
return nil, ErrCouldNotSendNotification
@@ -119,7 +116,7 @@ func (r *Repository) SendNotification(notification *model.IOSNotificationPayload
return &response, nil
}
-func NewRepository(db *gorm.DB, token *ios_apns_jwt.Token) *Repository {
+func NewRepository(db *gorm.DB, token *JWTToken) *Repository {
transport := &http2.Transport{
ReadIdleTimeout: ReadIdleTimeout,
}
@@ -140,9 +137,9 @@ func NewCronRepository(db *gorm.DB) (*Repository, error) {
return nil, err
}
- token, err := ios_apns_jwt.NewToken()
+ token, err := NewToken()
if err != nil {
- log.WithError(err).Fatal("Could not create APNs token")
+ log.WithError(err).Error("Could not create APNs token")
}
return NewRepository(db, token), nil
diff --git a/server/backend/ios_notifications/ios_apns/iosAPNsService.go b/server/backend/ios_notifications/apns/service.go
similarity index 74%
rename from server/backend/ios_notifications/ios_apns/iosAPNsService.go
rename to server/backend/ios_notifications/apns/service.go
index ef79c2e1..8e3f8c65 100644
--- a/server/backend/ios_notifications/ios_apns/iosAPNsService.go
+++ b/server/backend/ios_notifications/apns/service.go
@@ -1,12 +1,10 @@
-// Package ios_apns contains the logic for sending push notifications to iOS devices.
+// Package apns contains the logic for sending push notifications to iOS devices.
// and communicating with the Apple Push Notification Service (APNs).
-package ios_apns
+package apns
import (
"errors"
- "github.com/TUM-Dev/Campus-Backend/server/backend/influx"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns/ios_apns_jwt"
"github.com/TUM-Dev/Campus-Backend/server/model"
log "github.com/sirupsen/logrus"
"gorm.io/gorm"
@@ -27,7 +25,6 @@ type Service struct {
// and the request ID.
func (s *Service) RequestGradeUpdateForDevice(deviceID string) error {
campusRequestToken, err := s.Repository.CreateCampusTokenRequest(deviceID)
-
if err != nil {
log.WithError(err).Error("Could not create campus token request")
return ErrCouldNotCreateTokenRequest
@@ -35,32 +32,27 @@ func (s *Service) RequestGradeUpdateForDevice(deviceID string) error {
notification := model.NewIOSNotificationPayload(deviceID).Background(campusRequestToken.RequestID, model.IOSBackgroundCampusTokenRequest)
- res, err := s.Repository.SendBackgroundNotification(notification)
-
- if err != nil {
+ if _, err := s.Repository.SendBackgroundNotification(notification); err != nil {
log.WithError(err).Error("Could not send background notification")
return ErrCouldNotSendNotification
}
-
- influx.LogIOSBackgroundRequest(deviceID, campusRequestToken.RequestType, res.Reason)
-
return nil
}
func ValidateRequirementsForIOSNotificationsService() error {
- if ios_apns_jwt.ApnsKeyId == "" {
+ if ApnsKeyId == "" {
return errors.New("APNS_KEY_ID env variable is not set")
}
- if ios_apns_jwt.ApnsTeamId == "" {
+ if ApnsTeamId == "" {
return errors.New("APNS_TEAM_ID env variable is not set")
}
- if ios_apns_jwt.ApnsP8FilePath == "" {
+ if ApnsP8FilePath == "" {
return errors.New("APNS_P8_FILE_PATH env variable is not set")
}
- if _, err := ios_apns_jwt.APNsEncryptionKeyFromFile(); err != nil {
+ if _, err := APNsEncryptionKeyFromFile(); err != nil {
return errors.New("APNS P8 token is not valid or not set")
}
diff --git a/server/backend/ios_notifications/ios_crypto/encryptedString.go b/server/backend/ios_notifications/crypto/encrypted_string.go
similarity index 95%
rename from server/backend/ios_notifications/ios_crypto/encryptedString.go
rename to server/backend/ios_notifications/crypto/encrypted_string.go
index 24a7aac4..3ee6fd7c 100644
--- a/server/backend/ios_notifications/ios_crypto/encryptedString.go
+++ b/server/backend/ios_notifications/crypto/encrypted_string.go
@@ -1,5 +1,5 @@
-// Package ios_crypto provides functions for encrypting and decrypting strings using AES-256-GCM.
-package ios_crypto
+// Package crypto provides functions for encrypting and decrypting strings using AES-256-GCM.
+package crypto
import (
"crypto/aes"
diff --git a/server/backend/ios_notifications/ios_device/iosDeviceRepository.go b/server/backend/ios_notifications/device/repository.go
similarity index 95%
rename from server/backend/ios_notifications/ios_device/iosDeviceRepository.go
rename to server/backend/ios_notifications/device/repository.go
index 969256c0..13fe053c 100644
--- a/server/backend/ios_notifications/ios_device/iosDeviceRepository.go
+++ b/server/backend/ios_notifications/device/repository.go
@@ -1,4 +1,4 @@
-package ios_device
+package device
import (
"errors"
@@ -11,7 +11,7 @@ type Repository struct {
DB *gorm.DB
}
-func (repository *Repository) RegisterDevice(device *model.IOSDevice) error {
+func (repository *Repository) CreateDevice(device *model.IOSDevice) error {
return repository.DB.Transaction(func(tx *gorm.DB) error {
@@ -40,7 +40,7 @@ func (repository *Repository) RegisterDevice(device *model.IOSDevice) error {
})
}
-func (repository *Repository) RemoveDevice(deviceId string) error {
+func (repository *Repository) DeleteDevice(deviceId string) error {
if err := repository.DB.Delete(&model.IOSDevice{DeviceID: deviceId}).Error; err != nil {
return err
}
diff --git a/server/backend/ios_notifications/device/service.go b/server/backend/ios_notifications/device/service.go
new file mode 100644
index 00000000..80cc264d
--- /dev/null
+++ b/server/backend/ios_notifications/device/service.go
@@ -0,0 +1,60 @@
+// Package device provides functions to create/delete ios devices
+package device
+
+import (
+ pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
+
+ "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+type Service struct {
+ Repository *Repository
+}
+
+var (
+ ErrCouldNotCreateDevice = status.Error(codes.Internal, "Could not create device")
+ ErrCouldNotDeleteDevice = status.Error(codes.Internal, "Could not delete device")
+
+ iosRegisteredDevices = promauto.NewGauge(prometheus.GaugeOpts{
+ Subsystem: "ios",
+ Name: "ios_created_devices",
+ Help: "The number of currently created ios devices",
+ })
+)
+
+func (service *Service) CreateDevice(request *pb.CreateDeviceRequest) (*pb.CreateDeviceReply, error) {
+ device := model.IOSDevice{
+ DeviceID: request.GetDeviceId(),
+ PublicKey: request.GetPublicKey(),
+ }
+
+ if err := service.Repository.CreateDevice(&device); err != nil {
+ return nil, ErrCouldNotCreateDevice
+ }
+ iosRegisteredDevices.Inc()
+
+ return &pb.CreateDeviceReply{
+ DeviceId: device.DeviceID,
+ }, nil
+}
+
+func (service *Service) DeleteDevice(request *pb.DeleteDeviceRequest) (*pb.DeleteDeviceReply, error) {
+ if err := service.Repository.DeleteDevice(request.GetDeviceId()); err != nil {
+ return nil, ErrCouldNotDeleteDevice
+ }
+
+ iosRegisteredDevices.Dec()
+ return &pb.DeleteDeviceReply{
+ DeviceId: request.GetDeviceId(),
+ }, nil
+}
+
+func NewService(db *Repository) *Service {
+ return &Service{
+ Repository: db,
+ }
+}
diff --git a/server/backend/ios_notifications/ios_devices_activity_reset/iosDevicesActivityResetRepository.go b/server/backend/ios_notifications/devices_activity_reset/repository.go
similarity index 98%
rename from server/backend/ios_notifications/ios_devices_activity_reset/iosDevicesActivityResetRepository.go
rename to server/backend/ios_notifications/devices_activity_reset/repository.go
index e2c02b0d..251187c6 100644
--- a/server/backend/ios_notifications/ios_devices_activity_reset/iosDevicesActivityResetRepository.go
+++ b/server/backend/ios_notifications/devices_activity_reset/repository.go
@@ -1,4 +1,4 @@
-package ios_devices_activity_reset
+package devices_activity_reset
import (
"time"
diff --git a/server/backend/ios_notifications/ios_devices_activity_reset/iosDevicesActivityResetService.go b/server/backend/ios_notifications/devices_activity_reset/service.go
similarity index 94%
rename from server/backend/ios_notifications/ios_devices_activity_reset/iosDevicesActivityResetService.go
rename to server/backend/ios_notifications/devices_activity_reset/service.go
index 764c590e..f808a983 100644
--- a/server/backend/ios_notifications/ios_devices_activity_reset/iosDevicesActivityResetService.go
+++ b/server/backend/ios_notifications/devices_activity_reset/service.go
@@ -1,9 +1,9 @@
-package ios_devices_activity_reset
+package devices_activity_reset
import (
"time"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_device"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/device"
log "github.com/sirupsen/logrus"
"gorm.io/gorm"
)
@@ -41,7 +41,7 @@ func (service *Service) HandleScheduledActivityReset() error {
now := time.Now()
- devicesRepo := ios_device.NewRepository(service.Repository.DB)
+ devicesRepo := device.NewRepository(service.Repository.DB)
if now.Sub(daily.LastReset).Hours() > 24 {
if err := service.Repository.ResettedDevicesDaily(); err != nil {
diff --git a/server/backend/ios_notifications/ios_device/iosDeviceService.go b/server/backend/ios_notifications/ios_device/iosDeviceService.go
deleted file mode 100644
index 8f5209d7..00000000
--- a/server/backend/ios_notifications/ios_device/iosDeviceService.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Package ios_device provides functions to register and remove ios devices
-package ios_device
-
-import (
- pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
- "github.com/TUM-Dev/Campus-Backend/server/backend/influx"
- "github.com/TUM-Dev/Campus-Backend/server/model"
- "google.golang.org/grpc/codes"
- "google.golang.org/grpc/status"
-)
-
-type Service struct {
- Repository *Repository
-}
-
-var (
- ErrCouldNotRegisterDevice = status.Error(codes.Internal, "Could not register device")
- ErrCouldNotRemoveDevice = status.Error(codes.Internal, "Could not remove device")
-)
-
-func (service *Service) RegisterDevice(request *pb.RegisterDeviceRequest) (*pb.RegisterDeviceReply, error) {
- device := model.IOSDevice{
- DeviceID: request.GetDeviceId(),
- PublicKey: request.GetPublicKey(),
- }
-
- err := service.Repository.RegisterDevice(&device)
-
- if err != nil {
- return nil, ErrCouldNotRegisterDevice
- }
-
- influx.LogIOSRegisterDevice(request.GetDeviceId())
-
- return &pb.RegisterDeviceReply{
- DeviceId: device.DeviceID,
- }, nil
-}
-
-func (service *Service) RemoveDevice(request *pb.RemoveDeviceRequest) (*pb.RemoveDeviceReply, error) {
- err := service.Repository.RemoveDevice(request.GetDeviceId())
-
- if err != nil {
- return nil, ErrCouldNotRemoveDevice
- }
-
- influx.LogIOSRemoveDevice(request.GetDeviceId())
-
- return &pb.RemoveDeviceReply{
- DeviceId: request.GetDeviceId(),
- }, nil
-}
-
-func NewService(db *Repository) *Service {
- return &Service{
- Repository: db,
- }
-}
diff --git a/server/backend/ios_notifications/ios_request_response/iosRequestResponseRepository.go b/server/backend/ios_notifications/request_response/repository.go
similarity index 91%
rename from server/backend/ios_notifications/ios_request_response/iosRequestResponseRepository.go
rename to server/backend/ios_notifications/request_response/repository.go
index b1fab13b..9e2b39cc 100644
--- a/server/backend/ios_notifications/ios_request_response/iosRequestResponseRepository.go
+++ b/server/backend/ios_notifications/request_response/repository.go
@@ -1,14 +1,14 @@
-package ios_request_response
+package request_response
import (
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns/ios_apns_jwt"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/apns"
"github.com/TUM-Dev/Campus-Backend/server/model"
"gorm.io/gorm"
)
type Repository struct {
DB *gorm.DB
- Token *ios_apns_jwt.Token
+ Token *apns.JWTToken
}
func (r *Repository) SaveEncryptedGrade(grade *model.IOSEncryptedGrade) error {
@@ -70,7 +70,7 @@ func (r *Repository) DeleteAllRequestLogsForThisDeviceWithType(requestLog *model
return nil
}
-func NewRepository(db *gorm.DB, token *ios_apns_jwt.Token) *Repository {
+func NewRepository(db *gorm.DB, token *apns.JWTToken) *Repository {
return &Repository{
DB: db,
Token: token,
diff --git a/server/backend/ios_notifications/ios_request_response/iosRequestResponseService.go b/server/backend/ios_notifications/request_response/service.go
similarity index 90%
rename from server/backend/ios_notifications/ios_request_response/iosRequestResponseService.go
rename to server/backend/ios_notifications/request_response/service.go
index 4bc9bfec..85f58a72 100644
--- a/server/backend/ios_notifications/ios_request_response/iosRequestResponseService.go
+++ b/server/backend/ios_notifications/request_response/service.go
@@ -1,16 +1,18 @@
-// Package ios_request_response provides functionality to handle device requests.
+// Package request_response provides functionality to handle device requests.
// Device Requests are requests that are sent from the device to the server when the
// device received a background push notification from the backend.
-package ios_request_response
+package request_response
import (
"fmt"
+ "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/client_golang/prometheus/promauto"
+
pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
"github.com/TUM-Dev/Campus-Backend/server/backend/campus_api"
- "github.com/TUM-Dev/Campus-Backend/server/backend/influx"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_device"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/apns"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/device"
"github.com/TUM-Dev/Campus-Backend/server/model"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
@@ -28,6 +30,12 @@ var (
ErrInternalHandleGrades = status.Error(codes.Internal, "Could not handle grades request")
ErrCouldNotGetDevice = status.Error(codes.Internal, "Could not get device")
ErrAPNSNotActive = status.Error(codes.Internal, "APNS is not active")
+
+ collectedNewGrades = promauto.NewHistogram(prometheus.HistogramOpts{
+ Name: "ios_new_grades",
+ Help: "The total number of processed events",
+ Buckets: prometheus.LinearBuckets(0, 5, 5),
+ })
)
func (service *Service) HandleDeviceRequestResponse(request *pb.IOSDeviceRequestResponseRequest, apnsIsActive bool) (*pb.IOSDeviceRequestResponseReply, error) {
@@ -43,8 +51,6 @@ func (service *Service) HandleDeviceRequestResponse(request *pb.IOSDeviceRequest
return nil, ErrOutdatedRequest
}
- influx.LogIOSBackgroundRequestResponse(requestLog.DeviceID, requestLog.RequestType)
-
switch requestLog.RequestType {
case model.IOSBackgroundCampusTokenRequest.String():
campusToken := request.GetPayload()
@@ -66,7 +72,7 @@ func (service *Service) HandleDeviceRequestResponse(request *pb.IOSDeviceRequest
func (service *Service) handleDeviceCampusTokenRequest(requestLog *model.IOSDeviceRequestLog, campusToken string) (*pb.IOSDeviceRequestResponseReply, error) {
log.WithField("DeviceID", requestLog.DeviceID).Info("Handling campus token request")
- userRepo := ios_device.NewRepository(service.Repository.DB)
+ userRepo := device.NewRepository(service.Repository.DB)
device, err := userRepo.GetDevice(requestLog.DeviceID)
@@ -94,6 +100,7 @@ func (service *Service) handleDeviceCampusTokenRequest(requestLog *model.IOSDevi
}
newGrades := compareAndFindNewGrades(apiGrades.Grades, oldGrades)
+ collectedNewGrades.Observe(float64(len(newGrades)))
if len(newGrades) == 0 {
log.Info("No new grades found")
service.deleteRequestLog(requestLog)
@@ -114,9 +121,8 @@ func (service *Service) handleDeviceCampusTokenRequest(requestLog *model.IOSDevi
log.WithFields(log.Fields{"old": len(oldGrades), "new": len(newGrades)}).Info("Found grades")
if len(newGrades) > 0 && len(oldGrades) > 0 {
- apnsRepository := ios_apns.NewRepository(service.Repository.DB, service.Repository.Token)
+ apnsRepository := apns.NewRepository(service.Repository.DB, service.Repository.Token)
sendGradesToDevice(device, newGrades, apnsRepository)
- influx.LogIOSNewGrades(requestLog.DeviceID, len(newGrades))
}
service.deleteRequestLog(requestLog)
@@ -189,7 +195,7 @@ func (service *Service) encryptGradesAndStoreInDatabase(grades []model.IOSGrade,
}
}
-func sendGradesToDevice(device *model.IOSDevice, grades []model.IOSGrade, apns *ios_apns.Repository) {
+func sendGradesToDevice(device *model.IOSDevice, grades []model.IOSGrade, apns *apns.Repository) {
alertTitle := fmt.Sprintf("%d New Grades Available", len(grades))
if len(grades) == 1 {
diff --git a/server/backend/ios_notifications/ios_scheduled_update_log/iosScheduledUpdateLogRepository.go b/server/backend/ios_notifications/scheduled_update_log/repository.go
similarity index 83%
rename from server/backend/ios_notifications/ios_scheduled_update_log/iosScheduledUpdateLogRepository.go
rename to server/backend/ios_notifications/scheduled_update_log/repository.go
index 116c338d..e85ae0af 100644
--- a/server/backend/ios_notifications/ios_scheduled_update_log/iosScheduledUpdateLogRepository.go
+++ b/server/backend/ios_notifications/scheduled_update_log/repository.go
@@ -1,6 +1,6 @@
-// Package ios_scheduled_update_log provides functionality for logging scheduler updates
+// Package scheduled_update_log provides functionality for logging scheduler updates
// E.g. when a device updated its grades, the scheduler will log the update
-package ios_scheduled_update_log
+package scheduled_update_log
import (
"github.com/TUM-Dev/Campus-Backend/server/model"
diff --git a/server/backend/ios_notifications/ios_scheduling/iosSchedulingRepository.go b/server/backend/ios_notifications/scheduling/repository.go
similarity index 94%
rename from server/backend/ios_notifications/ios_scheduling/iosSchedulingRepository.go
rename to server/backend/ios_notifications/scheduling/repository.go
index d1a11d51..01c9ac2d 100644
--- a/server/backend/ios_notifications/ios_scheduling/iosSchedulingRepository.go
+++ b/server/backend/ios_notifications/scheduling/repository.go
@@ -1,4 +1,4 @@
-package ios_scheduling
+package scheduling
import (
"github.com/TUM-Dev/Campus-Backend/server/model"
diff --git a/server/backend/ios_notifications/ios_scheduling/iosSchedulingService.go b/server/backend/ios_notifications/scheduling/service.go
similarity index 81%
rename from server/backend/ios_notifications/ios_scheduling/iosSchedulingService.go
rename to server/backend/ios_notifications/scheduling/service.go
index 715684db..4c7aa2cb 100644
--- a/server/backend/ios_notifications/ios_scheduling/iosSchedulingService.go
+++ b/server/backend/ios_notifications/scheduling/service.go
@@ -1,14 +1,16 @@
-// Package ios_scheduling provides functionality for updating user information
+// Package scheduling provides functionality for updating user information
// and optionally sending notifications to iOS devices.
-package ios_scheduling
+package scheduling
import (
"sync"
- "github.com/TUM-Dev/Campus-Backend/server/backend/influx"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_device"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_scheduled_update_log"
+ "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/client_golang/prometheus/promauto"
+
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/apns"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/device"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/scheduled_update_log"
"github.com/TUM-Dev/Campus-Backend/server/model"
log "github.com/sirupsen/logrus"
)
@@ -18,12 +20,17 @@ const (
MaxRoutineCount = 10
)
+var devicesToUpdate = promauto.NewGauge(prometheus.GaugeOpts{
+ Name: "ios_scheduling_devices_to_update",
+ Help: "The numer of devices that should be updated for a given priority",
+})
+
type Service struct {
Repository *Repository
- DevicesRepository *ios_device.Repository
- SchedulerLogRepository *ios_scheduled_update_log.Repository
+ DevicesRepository *device.Repository
+ SchedulerLogRepository *scheduled_update_log.Repository
Priority *model.IOSSchedulingPriority
- APNs *ios_apns.Service
+ APNs *apns.Service
}
func (service *Service) HandleScheduledCron() error {
@@ -41,12 +48,9 @@ func (service *Service) HandleScheduledCron() error {
log.WithError(err).Error("can't get devices")
return err
}
+ devicesToUpdate.Set(float64(len(devices)))
- devicesLen := len(devices)
-
- influx.LogIOSSchedulingDevicesToUpdate(devicesLen, currentPriority.Priority)
-
- if devicesLen == 0 {
+ if len(devices) == 0 {
log.Info("No devices to update")
return nil
}
@@ -61,15 +65,12 @@ func (service *Service) HandleScheduledCron() error {
}
func (service *Service) handleDevices(devices []model.IOSDeviceLastUpdated) {
- routinesCount := routineCount(devices)
-
+ routinesCount := min(len(devices), MaxRoutineCount)
chunkSize := len(devices) / routinesCount
-
- perfectChunkable := (len(devices) % routinesCount) == 0
+ perfectlyChunkable := (len(devices) % routinesCount) == 0
chunksArrSize := routinesCount
-
- if !perfectChunkable {
+ if !perfectlyChunkable {
chunksArrSize = routinesCount + 1
}
@@ -79,7 +80,7 @@ func (service *Service) handleDevices(devices []model.IOSDeviceLastUpdated) {
chunks[i] = devices[i*chunkSize : (i+1)*chunkSize]
}
- if !perfectChunkable {
+ if !perfectlyChunkable {
chunks[routinesCount] = devices[routinesCount*chunkSize:]
}
@@ -108,14 +109,6 @@ func (service *Service) handleDevicesChunk(devices []model.IOSDeviceLastUpdated)
}
}
-func routineCount(devices []model.IOSDeviceLastUpdated) int {
- if len(devices) < MaxRoutineCount {
- return len(devices)
- }
-
- return MaxRoutineCount
-}
-
func (service *Service) LogScheduledUpdate(deviceID string) error {
scheduleLog := model.IOSScheduledUpdateLog{
DeviceID: deviceID,
@@ -171,9 +164,9 @@ func mergeIOSSchedulingPriorities(priorities []model.IOSSchedulingPriority) *mod
}
func NewService(repository *Repository,
- devicesRepository *ios_device.Repository,
- schedulerRepository *ios_scheduled_update_log.Repository,
- apnsService *ios_apns.Service,
+ devicesRepository *device.Repository,
+ schedulerRepository *scheduled_update_log.Repository,
+ apnsService *apns.Service,
) *Service {
return &Service{
Repository: repository,
diff --git a/server/backend/migration/20210709193000.go b/server/backend/migration/20210709193000.go
index c8e3967a..4968b74e 100644
--- a/server/backend/migration/20210709193000.go
+++ b/server/backend/migration/20210709193000.go
@@ -1,14 +1,21 @@
package migration
import (
- "database/sql"
-
"github.com/TUM-Dev/Campus-Backend/server/model"
"github.com/go-gormigrate/gormigrate/v2"
"github.com/guregu/null"
"gorm.io/gorm"
)
+type File struct {
+ File int64 `gorm:"primary_key;AUTO_INCREMENT;column:file;type:int;" json:"file"`
+ Name string `gorm:"column:name;type:text;size:16777215;" json:"name"`
+ Path string `gorm:"column:path;type:text;size:16777215;" json:"path"`
+ Downloads int32 `gorm:"column:downloads;type:int;default:0;" json:"downloads"`
+ URL null.String `gorm:"column:url;default:null;" json:"url"` // URL of the files source (if any)
+ Downloaded null.Bool `gorm:"column:downloaded;type:boolean;default:1;" json:"downloaded"` // true when file is ready to be served, false when still being downloaded
+}
+
// migrate20210709193000
// adds a "url" column to the database containing the url the file was downloaded from.
// adds a "finished" column to the database that indicates, that a files download is finished.
@@ -17,9 +24,14 @@ func (m TumDBMigrator) migrate20210709193000() *gormigrate.Migration {
return &gormigrate.Migration{
ID: "20210709193000",
Migrate: func(tx *gorm.DB) error {
+ if err := tx.AutoMigrate(
+ &File{},
+ ); err != nil {
+ return err
+ }
type Files struct {
- URL sql.NullString `gorm:"column:url;default:null;" json:"url"` // URL of the file source (if any)
- Downloaded sql.NullBool `gorm:"column:downloaded;type:boolean;default:1;" json:"downloaded"` // true when file is ready to be served, false when still being downloaded
+ URL null.String `gorm:"column:url;default:null;" json:"url"` // URL of the file source (if any)
+ Downloaded null.Bool `gorm:"column:downloaded;type:boolean;default:1;" json:"downloaded"` // true when file is ready to be served, false when still being downloaded
}
if err := tx.AutoMigrate(
&Files{},
@@ -29,7 +41,7 @@ func (m TumDBMigrator) migrate20210709193000() *gormigrate.Migration {
}
return tx.Create(&model.Crontab{
Interval: 300,
- Type: null.String{NullString: sql.NullString{String: "fileDownload", Valid: true}},
+ Type: null.StringFrom("fileDownload"),
}).Error
},
Rollback: func(tx *gorm.DB) error {
@@ -39,7 +51,7 @@ func (m TumDBMigrator) migrate20210709193000() *gormigrate.Migration {
if err := tx.Migrator().DropColumn("files", "finished"); err != nil {
return err
}
- return tx.Delete(&model.Crontab{}, "type = ? AND interval = ?", "fileDownload", 300).Error
+ return tx.Delete(&model.Crontab{}, "type = 'fileDownload'").Error
},
}
}
diff --git a/server/backend/migration/20220713000000.go b/server/backend/migration/20220713000000.go
index a8e53033..0f3eadf5 100644
--- a/server/backend/migration/20220713000000.go
+++ b/server/backend/migration/20220713000000.go
@@ -40,11 +40,11 @@ func (m TumDBMigrator) migrate20220713000000() *gormigrate.Migration {
},
Rollback: func(tx *gorm.DB) error {
- res := tx.Delete(&model.Crontab{}, "type = ? AND interval = ?", "dishNameDownload", 300).Error
+ res := tx.Delete(&model.Crontab{}, "type = 'dishNameDownload'").Error
if res != nil {
return res
}
- return tx.Delete(&model.Crontab{}, "type = ? AND interval = ?", "averageRatingComputation", 300).Error
+ return tx.Delete(&model.Crontab{}, "type = 'averageRatingComputation'").Error
},
}
}
diff --git a/server/backend/migration/20221119131300.go b/server/backend/migration/20221119131300.go
index 393bf9ee..8ea73cea 100644
--- a/server/backend/migration/20221119131300.go
+++ b/server/backend/migration/20221119131300.go
@@ -1,11 +1,9 @@
package migration
import (
- "database/sql"
_ "embed"
"encoding/json"
- "github.com/TUM-Dev/Campus-Backend/server/backend/cron"
"github.com/TUM-Dev/Campus-Backend/server/model"
"github.com/go-gormigrate/gormigrate/v2"
"github.com/guregu/null"
@@ -35,7 +33,7 @@ func (m TumDBMigrator) migrate20221119131300() *gormigrate.Migration {
return err
}
- if err := SafeEnumMigrate(tx, &model.Crontab{}, "type", "iosNotifications", "iosActivityReset"); err != nil {
+ if err := SafeEnumAdd(tx, &model.Crontab{}, "type", "iosNotifications", "iosActivityReset"); err != nil {
return err
}
@@ -53,7 +51,7 @@ func (m TumDBMigrator) migrate20221119131300() *gormigrate.Migration {
err := tx.Create(&model.Crontab{
Interval: 60,
- Type: null.String{NullString: sql.NullString{String: cron.IOSNotifications, Valid: true}},
+ Type: null.StringFrom("iosNotifications"),
}).Error
if err != nil {
@@ -62,12 +60,7 @@ func (m TumDBMigrator) migrate20221119131300() *gormigrate.Migration {
}
return tx.Create(&model.Crontab{
- Type: null.String{
- NullString: sql.NullString{
- String: cron.IOSActivityReset,
- Valid: true,
- },
- },
+ Type: null.StringFrom("iosActivityReset"),
Interval: 86400,
}).Error
},
@@ -92,18 +85,18 @@ func (m TumDBMigrator) migrate20221119131300() *gormigrate.Migration {
return err
}
- err := tx.Delete(&model.Crontab{}, "type = ? AND interval = ?", cron.IOSNotifications, 60).Error
+ err := tx.Delete(&model.Crontab{}, "type = 'iosNotifications'").Error
if err != nil {
return err
}
- err = tx.Delete(&model.Crontab{}, "type = ? AND interval = ?", cron.IOSActivityReset, 86400).Error
+ err = tx.Delete(&model.Crontab{}, "type = 'iosActivityReset'").Error
if err != nil {
return err
}
- return SafeEnumRollback(tx, &model.Crontab{}, "type", "iosNotifications", "iosActivityReset")
+ return SafeEnumRemove(tx, &model.Crontab{}, "type", "iosNotifications", "iosActivityReset")
},
}
}
diff --git a/server/backend/migration/20221210000000.go b/server/backend/migration/20221210000000.go
index 4baac263..9ec49d3c 100644
--- a/server/backend/migration/20221210000000.go
+++ b/server/backend/migration/20221210000000.go
@@ -1,8 +1,6 @@
package migration
import (
- "database/sql"
-
"github.com/TUM-Dev/Campus-Backend/server/model"
"github.com/go-gormigrate/gormigrate/v2"
"github.com/guregu/null"
@@ -24,23 +22,23 @@ func (m TumDBMigrator) migrate20221210000000() *gormigrate.Migration {
}
// allow "canteenHeadCount" in the enum
- if err := SafeEnumMigrate(tx, model.Crontab{}, "type", "canteenHeadCount"); err != nil {
+ if err := SafeEnumAdd(tx, model.Crontab{}, "type", "canteenHeadCount"); err != nil {
return err
}
return tx.Create(&model.Crontab{
Interval: 60 * 5, // Every 5 minutes
- Type: null.String{NullString: sql.NullString{String: "canteenHeadCount", Valid: true}},
+ Type: null.StringFrom("canteenHeadCount"),
}).Error
},
Rollback: func(tx *gorm.DB) error {
- err := tx.Delete(&model.Crontab{}, "type = ?", "canteenHeadCount").Error
+ err := tx.Delete(&model.Crontab{}, "type = 'canteenHeadCount'").Error
if err != nil {
return err
}
// Remove the 'canteenHeadCount' from the enum
- return SafeEnumRollback(tx, model.Crontab{}, "type", "canteenHeadCount")
+ return SafeEnumRemove(tx, model.Crontab{}, "type", "canteenHeadCount")
},
}
}
diff --git a/server/backend/migration/20230530000000.go b/server/backend/migration/20230530000000.go
new file mode 100644
index 00000000..add100b8
--- /dev/null
+++ b/server/backend/migration/20230530000000.go
@@ -0,0 +1,67 @@
+package migration
+
+import (
+ _ "embed"
+ "time"
+
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ "github.com/go-gormigrate/gormigrate/v2"
+ "github.com/guregu/null"
+ "gorm.io/gorm"
+)
+
+type PublishedExamResult struct {
+ Date time.Time
+ ExamID string `gorm:"primary_key"`
+ LectureTitle string
+ LectureType string
+ LectureSem string
+ Published bool
+}
+
+type NewExamResultsSubscriber struct {
+ CallbackUrl string `gorm:"primary_key"`
+ ApiKey null.String
+ CreatedAt time.Time `gorm:"autoCreateTime"`
+ LastNotifiedAt null.Time
+}
+
+func (m TumDBMigrator) migrate20230530000000() *gormigrate.Migration {
+ return &gormigrate.Migration{
+ ID: "20230530000000",
+ Migrate: func(tx *gorm.DB) error {
+
+ if err := tx.AutoMigrate(
+ &PublishedExamResult{},
+ &NewExamResultsSubscriber{},
+ ); err != nil {
+ return err
+ }
+
+ err := SafeEnumAdd(tx, model.Crontab{}, "type", "newExamResultsHook")
+ if err != nil {
+ return err
+ }
+
+ return tx.Create(&model.Crontab{
+ Interval: 60 * 10, // Every 10 minutes
+ Type: null.StringFrom("newExamResultsHook"),
+ }).Error
+ },
+ Rollback: func(tx *gorm.DB) error {
+ if err := tx.Migrator().DropTable(&PublishedExamResult{}); err != nil {
+ return err
+ }
+ if err := tx.Migrator().DropTable(&NewExamResultsSubscriber{}); err != nil {
+ return err
+ }
+
+ err := SafeEnumRemove(tx, model.Crontab{}, "type", "newExamResultsHook")
+ if err != nil {
+ return err
+ }
+
+ return tx.Delete(&model.Crontab{}, "type = 'newExamResultsHook'").Error
+ },
+ }
+}
diff --git a/server/backend/migration/20230825000000.go b/server/backend/migration/20230825000000.go
index 2e49d370..db35ca9d 100644
--- a/server/backend/migration/20230825000000.go
+++ b/server/backend/migration/20230825000000.go
@@ -1,8 +1,6 @@
package migration
import (
- "database/sql"
-
"github.com/TUM-Dev/Campus-Backend/server/model"
"github.com/go-gormigrate/gormigrate/v2"
"github.com/guregu/null"
@@ -18,15 +16,15 @@ func (m TumDBMigrator) migrate20230825000000() *gormigrate.Migration {
if err := tx.Delete(&model.Crontab{}, "type = 'chat'").Error; err != nil {
return err
}
- return SafeEnumRollback(tx, &model.Crontab{}, "type", "chat")
+ return SafeEnumRemove(tx, &model.Crontab{}, "type", "chat")
},
Rollback: func(tx *gorm.DB) error {
- if err := SafeEnumMigrate(tx, &model.Crontab{}, "type", "chat"); err != nil {
+ if err := SafeEnumAdd(tx, &model.Crontab{}, "type", "chat"); err != nil {
return err
}
return tx.Create(&model.Crontab{
Interval: 60 * 10, // Every 10 minutes
- Type: null.String{NullString: sql.NullString{String: "chat", Valid: true}},
+ Type: null.StringFrom("chat"),
}).Error
},
}
diff --git a/server/backend/migration/20230826000000.go b/server/backend/migration/20230826000000.go
new file mode 100644
index 00000000..3b8fe0dc
--- /dev/null
+++ b/server/backend/migration/20230826000000.go
@@ -0,0 +1,64 @@
+package migration
+
+import (
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ "github.com/go-gormigrate/gormigrate/v2"
+ "github.com/guregu/null"
+ "gorm.io/gorm"
+)
+
+type Feedback struct {
+ Processed bool `gorm:"column:processed;type:boolean;default:false;not null;"`
+ OsVersion null.String `gorm:"column:os_version;type:text;null;"`
+ AppVersion null.String `gorm:"column:app_version;type:text;null;"`
+}
+
+// TableName sets the insert table name for this struct type
+func (n *Feedback) TableName() string {
+ return "feedback"
+}
+
+// migrate20230826000000
+// adds a "feedbackEmail" cron job that runs every 30 minutes.
+func (m TumDBMigrator) migrate20230826000000() *gormigrate.Migration {
+ return &gormigrate.Migration{
+ ID: "20230826000000",
+ Migrate: func(tx *gorm.DB) error {
+ if err := tx.Migrator().AddColumn(&Feedback{}, "Processed"); err != nil {
+ return err
+ }
+ if err := tx.Migrator().AddColumn(&Feedback{}, "OsVersion"); err != nil {
+ return err
+ }
+ if err := tx.Migrator().AddColumn(&Feedback{}, "AppVersion"); err != nil {
+ return err
+ }
+ if err := tx.Exec("UPDATE feedback SET processed = true WHERE processed != true;").Error; err != nil {
+ return err
+ }
+ if err := SafeEnumAdd(tx, &model.Crontab{}, "type", "feedbackEmail"); err != nil {
+ return err
+ }
+ return tx.Create(&model.Crontab{
+ Interval: 60 * 30, // Every 30 minutes
+ Type: null.StringFrom("feedbackEmail"),
+ }).Error
+ },
+
+ Rollback: func(tx *gorm.DB) error {
+ if err := tx.Migrator().DropColumn(&Feedback{}, "Processed"); err != nil {
+ return err
+ }
+ if err := tx.Migrator().DropColumn(&Feedback{}, "OsVersion"); err != nil {
+ return err
+ }
+ if err := tx.Migrator().DropColumn(&Feedback{}, "AppVersion"); err != nil {
+ return err
+ }
+ if err := tx.Delete(&model.Crontab{}, "type = 'feedbackEmail'").Error; err != nil {
+ return err
+ }
+ return SafeEnumAdd(tx, &model.Crontab{}, "type", "feedbackEmail")
+ },
+ }
+}
diff --git a/server/backend/migration/20230904000000.go b/server/backend/migration/20230904000000.go
index b397022b..6c96cba6 100644
--- a/server/backend/migration/20230904000000.go
+++ b/server/backend/migration/20230904000000.go
@@ -1,8 +1,6 @@
package migration
import (
- "database/sql"
-
"github.com/TUM-Dev/Campus-Backend/server/model"
"github.com/go-gormigrate/gormigrate/v2"
"github.com/guregu/null"
@@ -19,19 +17,19 @@ func (m TumDBMigrator) migrate20230904000000() *gormigrate.Migration {
if err := tx.Delete(&model.Crontab{}, "type = 'ticketsales'").Error; err != nil {
return err
}
- if err := SafeEnumRollback(tx, model.Crontab{}, "type", "ticketsales"); err != nil {
+ if err := SafeEnumRemove(tx, model.Crontab{}, "type", "ticketsales"); err != nil {
return err
}
return nil
},
Rollback: func(tx *gorm.DB) error {
- if err := SafeEnumMigrate(tx, model.Crontab{}, "type", "ticketsales"); err != nil {
+ if err := SafeEnumAdd(tx, model.Crontab{}, "type", "ticketsales"); err != nil {
return err
}
return tx.Create(&model.Crontab{
Interval: 60 * 10, // Every 10 minutes
- Type: null.String{NullString: sql.NullString{String: "ticketsales", Valid: true}},
+ Type: null.StringFrom("ticketsales"),
}).Error
},
}
diff --git a/server/backend/migration/20230904100000.go b/server/backend/migration/20230904100000.go
new file mode 100644
index 00000000..c744432c
--- /dev/null
+++ b/server/backend/migration/20230904100000.go
@@ -0,0 +1,76 @@
+package migration
+
+import (
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ "github.com/go-gormigrate/gormigrate/v2"
+ "github.com/guregu/null"
+ "gorm.io/gorm"
+)
+
+// NewsSource struct is a row record of the newsSource table in the tca database
+type NewsSource struct {
+ Source int64 `gorm:"primary_key;AUTO_INCREMENT;column:source;type:int;"`
+ Title string `gorm:"column:title;type:text;size:16777215;"`
+ URL null.String `gorm:"column:url;type:text;size:16777215;"`
+ FileID int64 `gorm:"column:icon;not null;type:int;"`
+ File model.File `gorm:"foreignKey:FileID;references:file;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
+ Hook null.String `gorm:"column:hook;type:char;size:12;"`
+}
+
+// migrate20230904100000
+// migrates the crontab from kino to movie crontab
+func (m TumDBMigrator) migrate20230904100000() *gormigrate.Migration {
+ return &gormigrate.Migration{
+ ID: "20230904100000",
+ Migrate: func(tx *gorm.DB) error {
+ // modify the crontab
+ if err := tx.Delete(&model.Crontab{}, "type = 'kino'").Error; err != nil {
+ return err
+ }
+ if err := SafeEnumRemove(tx, &model.Crontab{}, "type", "kino"); err != nil {
+ return err
+ }
+ if err := SafeEnumAdd(tx, &model.Crontab{}, "type", "movie"); err != nil {
+ return err
+ }
+ if err := tx.AutoMigrate(&NewsSource{}); err != nil {
+ return err
+ }
+ // tu film news source is now inlined
+ if err := tx.Delete(&NewsSource{Source: 2}).Error; err != nil {
+ return err
+ }
+ return tx.Create(&model.Crontab{
+ Interval: 60 * 60 * 24, // daily
+ Type: null.StringFrom("movie"),
+ }).Error
+ },
+
+ Rollback: func(tx *gorm.DB) error {
+ // modify the crontab
+ if err := tx.Delete(&model.Crontab{}, "type = 'movie'").Error; err != nil {
+ return err
+ }
+ if err := SafeEnumRemove(tx, &model.Crontab{}, "type", "movie"); err != nil {
+ return err
+ }
+ if err := SafeEnumAdd(tx, &model.Crontab{}, "type", "kino"); err != nil {
+ return err
+ }
+ if err := tx.Create(&NewsSource{
+ Source: 2,
+ Title: "TU Film",
+ URL: null.StringFrom("http://www.tu-film.de/programm/index/upcoming.rss"),
+ FileID: 2,
+ Hook: null.String{},
+ }).Error; err != nil {
+ return err
+ }
+ return tx.Create(&model.Crontab{
+ Interval: 24 * 60 * 60, // daily
+ Type: null.StringFrom("kino"),
+ ID: null.IntFrom(2),
+ }).Error
+ },
+ }
+}
diff --git a/server/backend/migration/20231003000000.go b/server/backend/migration/20231003000000.go
new file mode 100644
index 00000000..b15eea95
--- /dev/null
+++ b/server/backend/migration/20231003000000.go
@@ -0,0 +1,232 @@
+package migration
+
+import (
+ "embed"
+ "encoding/json"
+
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ "github.com/guregu/null"
+
+ "gorm.io/gorm/logger"
+
+ "github.com/TUM-Dev/Campus-Backend/server/backend"
+ "github.com/go-gormigrate/gormigrate/v2"
+ log "github.com/sirupsen/logrus"
+ "gorm.io/gorm"
+)
+
+type multiLanguageTags struct {
+ MultiLanguageTags []tag `json:"tags"`
+}
+type tag struct {
+ TagNameEnglish string `json:"tagNameEnglish"`
+ TagNameGerman string `json:"tagNameGerman"`
+}
+
+type multiLanguageNameTags struct {
+ MultiLanguageNameTags []nameTag `json:"tags"`
+}
+type nameTag struct {
+ TagNameEnglish string `json:"tagNameEnglish"`
+ TagNameGerman string `json:"tagNameGerman"`
+ NotIncluded []string `json:"notincluded"`
+ CanBeIncluded []string `json:"canbeincluded"`
+}
+
+// State of the models at this migration
+type CafeteriaRatingTagOption struct {
+ CafeteriaRatingsTagOption int64 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingTagOption;type:int;not null;" json:"canteenRatingTagOption"`
+ DE string `gorm:"column:DE;text;default:de;not null;" json:"DE"`
+ EN string `gorm:"column:EN;text;default:en;not null;" json:"EN"`
+}
+
+type DishRatingTagOption struct {
+ DishRatingTagOption int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingTagOption;type:int;not null;" json:"dishRatingTagOption"`
+ DE string `gorm:"column:DE;type:text;default:de;not null;" json:"DE"`
+ EN string `gorm:"column:EN;type:text;default:en;not null;" json:"EN"`
+}
+
+type DishNameTagOption struct {
+ DishNameTagOption int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOption;type:int;not null;" json:"dishNameTagOption"`
+ DE string `gorm:"column:DE;type:text;not null;" json:"DE"`
+ EN string `gorm:"column:EN;type:text;not null;" json:"EN"`
+}
+
+// TableName sets the insert table name for this struct type
+func (n *DishNameTagOption) TableName() string {
+ return "dish_name_tag_option"
+}
+
+type DishNameTagOptionExcluded struct {
+ DishNameTagOptionExcluded int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOptionExcluded;type:int;not null;" json:"dishNameTagOptionExcluded"`
+ NameTagID int64 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
+ Expression string `gorm:"column:expression;type:text;" json:"expression"`
+}
+
+// TableName sets the insert table name for this struct type
+func (n *DishNameTagOptionExcluded) TableName() string {
+ return "dish_name_tag_option_excluded"
+}
+
+type DishNameTagOptionIncluded struct {
+ DishNameTagOptionIncluded int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOptionIncluded;type:int;not null;" json:"dishNameTagOptionIncluded"`
+ NameTagID int64 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
+ Expression string `gorm:"column:expression;type:text;" json:"expression"`
+}
+
+// TableName sets the insert table name for this struct type
+func (n *DishNameTagOptionIncluded) TableName() string {
+ return "dish_name_tag_option_included"
+}
+
+//go:embed static_data
+var staticData embed.FS
+
+// migrate20231003000000
+// migrates the static data for the canteen rating system and adds the necessary cronjob entries
+func (m TumDBMigrator) migrate20231003000000() *gormigrate.Migration {
+ return &gormigrate.Migration{
+ ID: "20231003000000",
+ Migrate: func(tx *gorm.DB) error {
+ if err := tx.Where("1=1").Delete(&DishNameTagOption{}, &CafeteriaRatingTagOption{}, &DishNameTagOptionIncluded{}, &DishNameTagOptionExcluded{}).Error; err != nil {
+ return err
+ }
+
+ setTagTable("static_data/dishRatingTags.json", tx, backend.DISH)
+ setTagTable("static_data/cafeteriaRatingTags.json", tx, backend.CAFETERIA)
+ setNameTagOptions(tx)
+ if err := SafeEnumAdd(tx, &model.Crontab{}, "type", "averageRatingComputation", "dishNameDownload"); err != nil {
+ return err
+ }
+ if err := tx.Create(&model.Crontab{
+ Interval: 300,
+ Type: null.StringFrom("averageRatingComputation"),
+ }).Error; err != nil {
+ return err
+ }
+ return tx.Create(&model.Crontab{
+ Interval: 302400,
+ Type: null.StringFrom("dishNameDownload"),
+ }).Error
+ },
+ Rollback: func(tx *gorm.DB) error {
+ if err := tx.Where("1=1").Delete(&DishNameTagOption{}, &CafeteriaRatingTagOption{}, &DishNameTagOptionIncluded{}, &DishNameTagOptionExcluded{}).Error; err != nil {
+ return err
+ }
+ if err := tx.Delete(&model.Crontab{}, "type = 'averageRatingComputation'").Error; err != nil {
+ return err
+ }
+ if err := tx.Delete(&model.Crontab{}, "type = 'dishNameDownload'").Error; err != nil {
+ return err
+ }
+ return SafeEnumRemove(tx, &model.Crontab{}, "type", "dishNameDownload", "averageRatingComputation")
+ },
+ }
+}
+
+/*
+setNameTagOptions updates the list of dishtags.
+If a tag with the exact german and english name does not exist yet, it will be created.
+Old tags won't be removed to prevent problems with foreign keys.
+*/
+func setNameTagOptions(db *gorm.DB) {
+ file, err := staticData.ReadFile("static_data/dishNameTags.json")
+ if err != nil {
+ log.WithError(err).Error("Error including json.")
+ }
+
+ var tagsNames multiLanguageNameTags
+ if err := json.Unmarshal(file, &tagsNames); err != nil {
+ log.WithError(err).Error("Error parsing nameTagList to json.")
+ }
+ for _, v := range tagsNames.MultiLanguageNameTags {
+ parent := DishNameTagOption{
+ DE: v.TagNameGerman,
+ EN: v.TagNameEnglish,
+ }
+
+ if err := db.Session(&gorm.Session{Logger: logger.Default.LogMode(logger.Silent)}).Create(&parent).Error; err != nil {
+ fields := log.Fields{"en": v.TagNameEnglish, "de": v.TagNameGerman}
+ log.WithError(err).WithFields(fields).Error("Error while creating tag")
+ }
+
+ addCanBeIncluded(parent.DishNameTagOption, db, v)
+ addNotIncluded(parent.DishNameTagOption, db, v)
+ }
+}
+
+func addNotIncluded(parentId int64, db *gorm.DB, v nameTag) {
+ for _, expression := range v.NotIncluded {
+ fields := log.Fields{"expression": expression, "parentId": parentId}
+ err := db.
+ Session(&gorm.Session{Logger: logger.Default.LogMode(logger.Silent)}).
+ Create(&DishNameTagOptionExcluded{
+ Expression: expression,
+ NameTagID: parentId}).Error
+ if err != nil {
+ log.WithError(err).WithFields(fields).Error("Unable to create new DishNameTagOptionExcluded")
+ }
+ }
+}
+
+func addCanBeIncluded(parentId int64, db *gorm.DB, v nameTag) {
+ for _, expression := range v.CanBeIncluded {
+ fields := log.Fields{"expression": expression, "parentId": parentId}
+
+ err := db.
+ Session(&gorm.Session{Logger: logger.Default.LogMode(logger.Silent)}).
+ Create(&DishNameTagOptionIncluded{
+ Expression: expression,
+ NameTagID: parentId,
+ }).Error
+ if err != nil {
+ log.WithError(err).WithFields(fields).Error("Unable to create new can be excluded tag")
+ }
+ }
+}
+
+/*
+Reads the json file at the given path and checks whether the values have already been inserted into the corresponding table.
+If an entry with the same German and English name exists, the entry won't be added.
+The TagType is used to identify the corresponding model
+*/
+func setTagTable(path string, db *gorm.DB, tagType backend.ModelType) {
+ tagsDish := generateRatingTagListFromFile(path)
+
+ for _, v := range tagsDish.MultiLanguageTags {
+ fields := log.Fields{"de": v.TagNameGerman, "en": v.TagNameEnglish}
+ var err error
+ if tagType == backend.CAFETERIA {
+ element := CafeteriaRatingTagOption{
+ DE: v.TagNameGerman,
+ EN: v.TagNameEnglish,
+ }
+ err = db.Create(&element).Error
+ } else {
+ element := DishRatingTagOption{
+ DE: v.TagNameGerman,
+ EN: v.TagNameEnglish,
+ }
+ err = db.Session(&gorm.Session{Logger: logger.Default.LogMode(logger.Silent)}).Create(&element).Error
+ }
+
+ if err != nil {
+ log.WithError(err).WithFields(fields).Error("Unable to create new can be excluded tag")
+ } else {
+ log.WithFields(fields).Debug("New Tag successfully created")
+ }
+ }
+}
+
+func generateRatingTagListFromFile(path string) multiLanguageTags {
+ file, err := staticData.ReadFile(path)
+ if err != nil {
+ log.WithError(err).Error("Error including json.")
+ }
+
+ var tags multiLanguageTags
+ if err := json.Unmarshal(file, &tags); err != nil {
+ log.WithError(err).Error("Error parsing ratingTagList to json.")
+ }
+ return tags
+}
diff --git a/server/backend/migration/migration.go b/server/backend/migration/migration.go
index 7cd9acf6..710c333f 100644
--- a/server/backend/migration/migration.go
+++ b/server/backend/migration/migration.go
@@ -26,7 +26,7 @@ func (m TumDBMigrator) Migrate() error {
err := m.database.AutoMigrate(
&model.TopNews{},
&model.Crontab{},
- &model.Files{},
+ &model.File{},
&model.NewsSource{},
&model.NewsAlert{},
&model.News{},
@@ -50,6 +50,10 @@ func (m TumDBMigrator) Migrate() error {
m.migrate20221210000000(),
m.migrate20230825000000(),
m.migrate20230904000000(),
+ m.migrate20230530000000(),
+ m.migrate20230904100000(),
+ m.migrate20230826000000(),
+ m.migrate20231003000000(),
})
err := mig.Migrate()
return err
diff --git a/server/backend/migration/safeEnumMigrate.go b/server/backend/migration/safe_enum_migrate.go
similarity index 93%
rename from server/backend/migration/safeEnumMigrate.go
rename to server/backend/migration/safe_enum_migrate.go
index 376bdaa4..c034f861 100644
--- a/server/backend/migration/safeEnumMigrate.go
+++ b/server/backend/migration/safe_enum_migrate.go
@@ -8,7 +8,7 @@ import (
"gorm.io/gorm"
)
-func SafeEnumMigrate(tx *gorm.DB, table interface{}, column string, additionalTypes ...string) error {
+func SafeEnumAdd(tx *gorm.DB, table interface{}, column string, additionalTypes ...string) error {
enumTypes, err := getEnumTypesFromDB(tx, table, column)
if err != nil {
@@ -21,7 +21,7 @@ func SafeEnumMigrate(tx *gorm.DB, table interface{}, column string, additionalTy
return alterEnumColumn(tx, table, column, enumTypes)
}
-func SafeEnumRollback(tx *gorm.DB, table interface{}, column string, rollbackTypes ...string) error {
+func SafeEnumRemove(tx *gorm.DB, table interface{}, column string, rollbackTypes ...string) error {
enumTypes, err := getEnumTypesFromDB(tx, table, column)
if err != nil {
diff --git a/server/backend/migration/safeEnumMigrate_test.go b/server/backend/migration/safe_enum_migrate_test.go
similarity index 100%
rename from server/backend/migration/safeEnumMigrate_test.go
rename to server/backend/migration/safe_enum_migrate_test.go
diff --git a/server/backend/static_data/cafeteriaRatingTags.json b/server/backend/migration/static_data/cafeteriaRatingTags.json
similarity index 100%
rename from server/backend/static_data/cafeteriaRatingTags.json
rename to server/backend/migration/static_data/cafeteriaRatingTags.json
diff --git a/server/backend/static_data/dishNameTags.json b/server/backend/migration/static_data/dishNameTags.json
similarity index 100%
rename from server/backend/static_data/dishNameTags.json
rename to server/backend/migration/static_data/dishNameTags.json
diff --git a/server/backend/static_data/dishRatingTags.json b/server/backend/migration/static_data/dishRatingTags.json
similarity index 100%
rename from server/backend/static_data/dishRatingTags.json
rename to server/backend/migration/static_data/dishRatingTags.json
diff --git a/server/backend/movie.go b/server/backend/movie.go
new file mode 100644
index 00000000..12981ccd
--- /dev/null
+++ b/server/backend/movie.go
@@ -0,0 +1,46 @@
+package backend
+
+import (
+ "context"
+
+ pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ log "github.com/sirupsen/logrus"
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
+ "google.golang.org/protobuf/types/known/timestamppb"
+)
+
+func (s *CampusServer) ListMovies(ctx context.Context, req *pb.ListMoviesRequest) (*pb.ListMoviesReply, error) {
+ var movies []model.Kino
+ tx := s.db.WithContext(ctx).Joins("File")
+ if req.OldestDateAt.GetSeconds() != 0 || req.OldestDateAt.GetNanos() != 0 {
+ tx = tx.Where("date > ?", req.OldestDateAt.AsTime())
+ }
+ if err := tx.Find(&movies, "kino > ?", req.LastId).Error; err != nil {
+ log.WithError(err).Error("Error while fetching movies from database")
+ return nil, status.Error(codes.Internal, "Error while fetching movies from database")
+ }
+ var movieResponse []*pb.Movie
+ for _, movie := range movies {
+ movieResponse = append(movieResponse, &pb.Movie{
+ MovieId: movie.Id,
+ Date: timestamppb.New(movie.Date),
+ Created: timestamppb.New(movie.Created),
+ Title: movie.Title,
+ ReleaseYear: movie.Year,
+ Runtime: movie.Runtime,
+ Genre: movie.Genre,
+ Director: movie.Director,
+ Actors: movie.Actors,
+ ImdbRating: movie.ImdbRating,
+ Description: movie.Description,
+ CoverUrl: movie.File.FullExternalUrl(),
+ CoverId: movie.File.File,
+ Link: movie.Link,
+ })
+ }
+ return &pb.ListMoviesReply{
+ Movies: movieResponse,
+ }, nil
+}
diff --git a/server/backend/movie_test.go b/server/backend/movie_test.go
new file mode 100644
index 00000000..db06e585
--- /dev/null
+++ b/server/backend/movie_test.go
@@ -0,0 +1,119 @@
+package backend
+
+import (
+ "context"
+ "database/sql"
+ "testing"
+ "time"
+
+ "github.com/DATA-DOG/go-sqlmock"
+ pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
+ "github.com/stretchr/testify/require"
+ "github.com/stretchr/testify/suite"
+ "google.golang.org/protobuf/types/known/timestamppb"
+ "gorm.io/driver/mysql"
+ "gorm.io/gorm"
+)
+
+type MovieSuite struct {
+ suite.Suite
+ DB *gorm.DB
+ mock sqlmock.Sqlmock
+}
+
+func (s *MovieSuite) SetupSuite() {
+ var (
+ db *sql.DB
+ err error
+ )
+
+ db, s.mock, err = sqlmock.New()
+ require.NoError(s.T(), err)
+
+ dialector := mysql.New(mysql.Config{
+ Conn: db,
+ DriverName: "mysql",
+ })
+ s.mock.ExpectQuery("SELECT VERSION()").
+ WillReturnRows(sqlmock.NewRows([]string{"VERSION()"}).AddRow("10.11.4-MariaDB"))
+ s.DB, err = gorm.Open(dialector, &gorm.Config{})
+ require.NoError(s.T(), err)
+}
+
+var (
+ movie1 = pb.Movie{
+ MovieId: 1,
+ Date: timestamppb.New(time.Now()),
+ Created: timestamppb.New(time.Now()),
+ Title: "Mission Impossible 4 - Ghost Protocol",
+ ReleaseYear: "2011",
+ Runtime: "133 min",
+ Genre: "Action, Adventure, Thriller",
+ Director: "Brad Bird",
+ Actors: "Tom Cruise, Jeremy Renner, Simon Pegg, Paula Patton",
+ ImdbRating: "7.4",
+ Description: "The IMF is shut down when it's implicated in the bombing of the Kremlin, causing Ethan Hunt and his new team to go rogue to clear their organization's name.",
+ CoverUrl: "https://api.tum.app/files/movie/mission_impossible_4.jpg",
+ CoverId: 1,
+ Link: "https://www.imdb.com/title/tt1229238/",
+ }
+ movie2 = pb.Movie{
+ MovieId: 2,
+ Date: timestamppb.New(time.Now()),
+ Created: timestamppb.New(time.Now()),
+ Title: "Mission Impossible 5 - Rogue Nation",
+ ReleaseYear: "2015",
+ Runtime: "131 min",
+ Genre: "Action, Adventure, Thriller",
+ Director: "Christopher McQuarrie",
+ Actors: "Tom Cruise, Jeremy Renner, Simon Pegg, Rebecca Ferguson",
+ ImdbRating: "7.4",
+ Description: "Ethan and his team take on their most impossible mission yet when they have to eradicate an international rogue organization as highly skilled as they are and committed to destroying the IMF.",
+ CoverUrl: "https://api.tum.app/files/movie/mission_impossible_5.jpg",
+ CoverId: 2,
+ Link: "https://www.imdb.com/title/tt2381249/",
+ }
+)
+
+func (s *MovieSuite) Test_ListMoviesAll() {
+ server := CampusServer{db: s.DB}
+ s.mock.ExpectQuery("SELECT `kino`.`kino`,`kino`.`date`,`kino`.`created`,`kino`.`title`,`kino`.`year`,`kino`.`runtime`,`kino`.`genre`,`kino`.`director`,`kino`.`actors`,`kino`.`rating`,`kino`.`description`,`kino`.`trailer`,`kino`.`cover`,`kino`.`link`,`File`.`file` AS `File__file`,`File`.`name` AS `File__name`,`File`.`path` AS `File__path`,`File`.`downloads` AS `File__downloads`,`File`.`url` AS `File__url`,`File`.`downloaded` AS `File__downloaded` FROM `kino` LEFT JOIN `files` `File` ON `kino`.`cover` = `File`.`file` WHERE kino > ?").
+ WithArgs(-1).
+ WillReturnRows(sqlmock.NewRows([]string{"kino", "date", "created", "title", "year", "runtime", "genre", "director", "actors", "rating", "description", "trailer", "cover", "link", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded"}).
+ AddRow(movie2.MovieId, movie2.Date.AsTime(), movie2.Created.AsTime(), movie2.Title, movie2.ReleaseYear, movie2.Runtime, movie2.Genre, movie2.Director, movie2.Actors, movie2.ImdbRating, movie2.Description, nil, movie2.CoverId, movie2.Link, movie2.CoverId, "mission_impossible_5.jpg", "movie/", 1, "", 1).
+ AddRow(movie1.MovieId, movie1.Date.AsTime(), movie1.Created.AsTime(), movie1.Title, movie1.ReleaseYear, movie1.Runtime, movie1.Genre, movie1.Director, movie1.Actors, movie1.ImdbRating, movie1.Description, nil, movie1.CoverId, movie1.Link, movie1.CoverId, "mission_impossible_4.jpg", "movie/", 1, "", 1))
+ response, err := server.ListMovies(context.Background(), &pb.ListMoviesRequest{LastId: -1})
+ require.NoError(s.T(), err)
+ require.Equal(s.T(), &pb.ListMoviesReply{Movies: []*pb.Movie{&movie2, &movie1}}, response)
+}
+
+func (s *MovieSuite) Test_ListMoviesOne() {
+ server := CampusServer{db: s.DB}
+ s.mock.ExpectQuery("SELECT `kino`.`kino`,`kino`.`date`,`kino`.`created`,`kino`.`title`,`kino`.`year`,`kino`.`runtime`,`kino`.`genre`,`kino`.`director`,`kino`.`actors`,`kino`.`rating`,`kino`.`description`,`kino`.`trailer`,`kino`.`cover`,`kino`.`link`,`File`.`file` AS `File__file`,`File`.`name` AS `File__name`,`File`.`path` AS `File__path`,`File`.`downloads` AS `File__downloads`,`File`.`url` AS `File__url`,`File`.`downloaded` AS `File__downloaded` FROM `kino` LEFT JOIN `files` `File` ON `kino`.`cover` = `File`.`file` WHERE kino > ?").
+ WithArgs(1).
+ WillReturnRows(sqlmock.NewRows([]string{"kino", "date", "created", "title", "year", "runtime", "genre", "director", "actors", "rating", "description", "trailer", "cover", "link", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded"}).
+ AddRow(movie1.MovieId, movie1.Date.AsTime(), movie1.Created.AsTime(), movie1.Title, movie1.ReleaseYear, movie1.Runtime, movie1.Genre, movie1.Director, movie1.Actors, movie1.ImdbRating, movie1.Description, nil, movie1.CoverId, movie1.Link, movie1.CoverId, "mission_impossible_4.jpg", "movie/", 1, "", 1))
+ response, err := server.ListMovies(context.Background(), &pb.ListMoviesRequest{LastId: 1})
+ require.NoError(s.T(), err)
+ require.Equal(s.T(), &pb.ListMoviesReply{Movies: []*pb.Movie{&movie1}}, response)
+}
+
+func (s *MovieSuite) Test_ListMoviesNone() {
+ server := CampusServer{db: s.DB}
+ s.mock.ExpectQuery("SELECT `kino`.`kino`,`kino`.`date`,`kino`.`created`,`kino`.`title`,`kino`.`year`,`kino`.`runtime`,`kino`.`genre`,`kino`.`director`,`kino`.`actors`,`kino`.`rating`,`kino`.`description`,`kino`.`trailer`,`kino`.`cover`,`kino`.`link`,`File`.`file` AS `File__file`,`File`.`name` AS `File__name`,`File`.`path` AS `File__path`,`File`.`downloads` AS `File__downloads`,`File`.`url` AS `File__url`,`File`.`downloaded` AS `File__downloaded` FROM `kino` LEFT JOIN `files` `File` ON `kino`.`cover` = `File`.`file` WHERE kino > ?").
+ WithArgs(42).
+ WillReturnRows(sqlmock.NewRows([]string{"kino", "date", "created", "title", "year", "runtime", "genre", "director", "actors", "rating", "description", "trailer", "cover", "link", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded"}))
+ response, err := server.ListMovies(context.Background(), &pb.ListMoviesRequest{LastId: 42})
+ require.NoError(s.T(), err)
+ require.Equal(s.T(), &pb.ListMoviesReply{Movies: []*pb.Movie(nil)}, response)
+}
+
+func (s *MovieSuite) AfterTest(_, _ string) {
+ require.NoError(s.T(), s.mock.ExpectationsWereMet())
+}
+
+// In order for 'go test' to run this suite, we need to create
+// a normal test function and pass our suite to suite.Run
+func TestMovieSuite(t *testing.T) {
+ suite.Run(t, new(MovieSuite))
+}
diff --git a/server/backend/new_exam_results_hook/scheduling/repository.go b/server/backend/new_exam_results_hook/scheduling/repository.go
new file mode 100644
index 00000000..558cb6c6
--- /dev/null
+++ b/server/backend/new_exam_results_hook/scheduling/repository.go
@@ -0,0 +1,41 @@
+package scheduling
+
+import (
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ "gorm.io/gorm"
+ "gorm.io/gorm/logger"
+)
+
+type Repository struct {
+ DB *gorm.DB
+}
+
+func (repository *Repository) StoreExamResultsPublished(examResultsPublished []model.PublishedExamResult) error {
+ db := repository.DB
+
+ return db.Transaction(func(tx *gorm.DB) error {
+ err := tx.Where("1 = 1").Delete(&model.PublishedExamResult{}).Error
+
+ if err != nil {
+ return err
+ }
+
+ // disabled logging because this query always prints a warning because it takes longer then normal
+ // to execute because we bulk insert a lot of data
+ return tx.Session(&gorm.Session{Logger: logger.Default.LogMode(logger.Silent)}).
+ Create(examResultsPublished).Error
+ })
+}
+
+func (repository *Repository) FindAllExamResultsPublished() (*[]model.PublishedExamResult, error) {
+ var results []model.PublishedExamResult
+ err := repository.DB.Find(&results).Error
+
+ return &results, err
+}
+
+func NewRepository(db *gorm.DB) *Repository {
+ return &Repository{
+ DB: db,
+ }
+}
diff --git a/server/backend/new_exam_results_hook/scheduling/service.go b/server/backend/new_exam_results_hook/scheduling/service.go
new file mode 100644
index 00000000..e1b68c13
--- /dev/null
+++ b/server/backend/new_exam_results_hook/scheduling/service.go
@@ -0,0 +1,99 @@
+package scheduling
+
+import (
+ "os"
+
+ "github.com/TUM-Dev/Campus-Backend/server/backend/campus_api"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/apns"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/device"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/new_exam_results_hook/subscriber"
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ log "github.com/sirupsen/logrus"
+)
+
+var (
+ CampusApiToken = os.Getenv("CAMPUS_API_TOKEN")
+)
+
+type Service struct {
+ Repository *Repository
+ DevicesRepository *device.Repository
+ Priority *model.IOSSchedulingPriority
+ APNs *apns.Service
+}
+
+func (service *Service) HandleScheduledCron() error {
+ log.Info("Fetching published exam results")
+
+ apiResult, err := campus_api.FetchExamResultsPublished(CampusApiToken)
+ if err != nil {
+ return err
+ }
+
+ var apiExamResults []model.PublishedExamResult
+ for _, apiExamResult := range apiResult.ExamResults {
+ apiExamResults = append(apiExamResults, *apiExamResult.ToDBExamResult())
+ }
+
+ storedExamResults, err := service.Repository.FindAllExamResultsPublished()
+ if err != nil {
+ return err
+ }
+
+ newPublishedExamResults := service.findNewPublishedExamResults(&apiExamResults, storedExamResults)
+
+ if len(*newPublishedExamResults) > 0 {
+ service.notifySubscribers(newPublishedExamResults)
+ } else {
+ log.Info("No new published exam results")
+ }
+
+ return service.Repository.StoreExamResultsPublished(apiExamResults)
+}
+
+func (service *Service) findNewPublishedExamResults(apiExamResults, storedExamResults *[]model.PublishedExamResult) *[]model.PublishedExamResult {
+ var apiExamResultsMap = make(map[string]model.PublishedExamResult)
+ for _, apiExamResult := range *apiExamResults {
+ apiExamResultsMap[apiExamResult.ExamID] = apiExamResult
+ }
+
+ var storedExamResultsMap = make(map[string]model.PublishedExamResult)
+ for _, storedExamResult := range *storedExamResults {
+ storedExamResultsMap[storedExamResult.ExamID] = storedExamResult
+ }
+
+ var newPublishedExamResults []model.PublishedExamResult
+
+ for id, result := range apiExamResultsMap {
+ if storedResult, ok := storedExamResultsMap[id]; ok && !storedResult.Published && result.Published {
+ newPublishedExamResults = append(newPublishedExamResults, result)
+ }
+ }
+
+ return &newPublishedExamResults
+}
+
+func (service *Service) notifySubscribers(newPublishedExamResults *[]model.PublishedExamResult) {
+ log.Infof("Notifying subscribers about %d published exam results", len(*newPublishedExamResults))
+
+ subscribersRepo := subscriber.NewRepository(service.Repository.DB)
+ subscribersService := subscriber.NewService(subscribersRepo)
+
+ err := subscribersService.NotifySubscribers(newPublishedExamResults)
+ if err != nil {
+ log.WithError(err).Error("Failed to notify subscribers")
+ return
+ }
+}
+
+func NewService(repository *Repository,
+ devicesRepository *device.Repository,
+ apnsService *apns.Service,
+) *Service {
+ return &Service{
+ Repository: repository,
+ DevicesRepository: devicesRepository,
+ Priority: model.DefaultIOSSchedulingPriority(),
+ APNs: apnsService,
+ }
+}
diff --git a/server/backend/new_exam_results_hook/subscriber/repository.go b/server/backend/new_exam_results_hook/subscriber/repository.go
new file mode 100644
index 00000000..a8059293
--- /dev/null
+++ b/server/backend/new_exam_results_hook/subscriber/repository.go
@@ -0,0 +1,59 @@
+package subscriber
+
+import (
+ "bytes"
+ "encoding/json"
+ "net/http"
+
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ log "github.com/sirupsen/logrus"
+ "gorm.io/gorm"
+)
+
+type Repository struct {
+ DB *gorm.DB
+}
+
+func (repository *Repository) FindAllSubscribers() (*[]model.NewExamResultsSubscriber, error) {
+ db := repository.DB
+
+ var subscribers []model.NewExamResultsSubscriber
+
+ err := db.Find(&subscribers).Error
+
+ return &subscribers, err
+}
+
+func (repository *Repository) NotifySubscriber(subscriber *model.NewExamResultsSubscriber, newGrades *[]model.PublishedExamResult) error {
+ url := subscriber.CallbackUrl
+
+ body, err := json.Marshal(newGrades)
+ if err != nil {
+ log.WithError(err).Error("Error while marshalling newGrades")
+ return err
+ }
+
+ req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(body))
+ if err != nil {
+ log.WithError(err).Error("Error while creating request")
+ return err
+ }
+ req.Header.Set("Content-Type", "application/json")
+ if subscriber.ApiKey.Valid {
+ req.Header.Set("Authorization", subscriber.ApiKey.String)
+ }
+
+ _, err = http.DefaultClient.Do(req)
+ if err != nil {
+ log.WithField("url", url).WithError(err).Error("Error while fetching url")
+ return err
+ }
+
+ return nil
+}
+
+func NewRepository(db *gorm.DB) *Repository {
+ return &Repository{
+ DB: db,
+ }
+}
diff --git a/server/backend/new_exam_results_hook/subscriber/service.go b/server/backend/new_exam_results_hook/subscriber/service.go
new file mode 100644
index 00000000..ef8509f6
--- /dev/null
+++ b/server/backend/new_exam_results_hook/subscriber/service.go
@@ -0,0 +1,34 @@
+package subscriber
+
+import (
+ "github.com/TUM-Dev/Campus-Backend/server/model"
+ log "github.com/sirupsen/logrus"
+)
+
+type Service struct {
+ Repository *Repository
+}
+
+func (service *Service) NotifySubscribers(newGrades *[]model.PublishedExamResult) error {
+ repository := service.Repository
+
+ subscribers, err := repository.FindAllSubscribers()
+ if err != nil {
+ return err
+ }
+
+ for _, subscriber := range *subscribers {
+ if err := repository.NotifySubscriber(&subscriber, newGrades); err != nil {
+ log.WithError(err).Error("Failed to notify subscriber")
+ continue
+ }
+ }
+
+ return nil
+}
+
+func NewService(repository *Repository) *Service {
+ return &Service{
+ Repository: repository,
+ }
+}
diff --git a/server/backend/news.go b/server/backend/news.go
index 1b86ef33..f8f29847 100644
--- a/server/backend/news.go
+++ b/server/backend/news.go
@@ -2,35 +2,113 @@ package backend
import (
"context"
+ "errors"
"fmt"
+ "gorm.io/gorm"
+
+ "google.golang.org/protobuf/types/known/timestamppb"
+
pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
"github.com/TUM-Dev/Campus-Backend/server/model"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
- "google.golang.org/protobuf/types/known/emptypb"
)
-func (s *CampusServer) GetNewsSources(ctx context.Context, _ *emptypb.Empty) (newsSources *pb.NewsSourceReply, err error) {
- if err = s.checkDevice(ctx); err != nil {
- return
+func (s *CampusServer) ListNewsSources(ctx context.Context, _ *pb.ListNewsSourcesRequest) (*pb.ListNewsSourcesReply, error) {
+ if err := s.checkDevice(ctx); err != nil {
+ return nil, err
}
var sources []model.NewsSource
- if err := s.db.Joins("Files").Find(&sources).Error; err != nil {
+ if err := s.db.WithContext(ctx).Joins("File").Find(&sources).Error; err != nil {
log.WithError(err).Error("could not find newsSources")
- return nil, status.Error(codes.Internal, "could not GetNewsSources")
+ return nil, status.Error(codes.Internal, "could not ListNewsSources")
}
var resp []*pb.NewsSource
for _, source := range sources {
log.WithField("title", source.Title).Trace("sending news source")
resp = append(resp, &pb.NewsSource{
- Source: fmt.Sprintf("%d", source.Source),
- Title: source.Title,
- Icon: source.Files.URL.String,
+ Source: fmt.Sprintf("%d", source.Source),
+ Title: source.Title,
+ IconUrl: source.File.FullExternalUrl(),
+ })
+ }
+ return &pb.ListNewsSourcesReply{Sources: resp}, nil
+}
+
+func (s *CampusServer) ListNews(ctx context.Context, req *pb.ListNewsRequest) (*pb.ListNewsReply, error) {
+ if err := s.checkDevice(ctx); err != nil {
+ return nil, err
+ }
+
+ var newsEntries []model.News
+ tx := s.db.WithContext(ctx).Joins("File").Joins("NewsSource").Joins("NewsSource.File")
+ if req.NewsSource != 0 {
+ tx = tx.Where("src = ?", req.NewsSource)
+ }
+ if req.OldestDateAt.GetSeconds() != 0 || req.OldestDateAt.GetNanos() != 0 {
+ tx = tx.Where("date > ?", req.OldestDateAt.AsTime())
+ }
+ if req.LastNewsId != 0 {
+ tx = tx.Where("news > ?", req.LastNewsId)
+ }
+ if err := tx.Find(&newsEntries).Error; err != nil {
+ log.WithError(err).Error("could not find news item")
+ return nil, status.Error(codes.Internal, "could not ListNews")
+ }
+
+ resp := make([]*pb.News, len(newsEntries))
+ for i, item := range newsEntries {
+ log.WithField("title", item.Title).Trace("sending news")
+ imgUrl := ""
+ if item.File != nil {
+ imgUrl = item.File.FullExternalUrl()
+ }
+ resp[i] = &pb.News{
+ Id: item.News,
+ Title: item.Title,
+ Text: item.Description,
+ Link: item.Link,
+ ImageUrl: imgUrl,
+ SourceId: fmt.Sprintf("%d", item.NewsSource.Source),
+ SourceTitle: item.NewsSource.Title,
+ SourceIconUrl: item.NewsSource.File.FullExternalUrl(),
+ Created: timestamppb.New(item.Created),
+ Date: timestamppb.New(item.Date),
+ }
+ }
+ return &pb.ListNewsReply{News: resp}, nil
+}
+
+func (s *CampusServer) ListNewsAlerts(ctx context.Context, req *pb.ListNewsAlertsRequest) (*pb.ListNewsAlertsReply, error) {
+ if err := s.checkDevice(ctx); err != nil {
+ return nil, err
+ }
+
+ var res []*model.NewsAlert
+ tx := s.db.WithContext(ctx).Joins("File").Where("news_alert.to >= NOW()")
+ if req.LastNewsAlertId != 0 {
+ tx = tx.Where("news_alert.news_alert > ?", req.LastNewsAlertId)
+ }
+ if err := tx.Find(&res).Error; errors.Is(err, gorm.ErrRecordNotFound) {
+ return nil, status.Error(codes.NotFound, "no news alerts")
+ } else if err != nil {
+ log.WithError(err).Error("could not ListNewsAlerts")
+ return nil, status.Error(codes.Internal, "could not ListNewsAlerts")
+ }
+
+ var alerts []*pb.NewsAlert
+ for _, alert := range res {
+ alerts = append(alerts, &pb.NewsAlert{
+ ImageUrl: alert.File.FullExternalUrl(),
+ Link: alert.Link.String,
+ Created: timestamppb.New(alert.Created),
+ From: timestamppb.New(alert.From),
+ To: timestamppb.New(alert.To),
})
}
- return &pb.NewsSourceReply{Sources: resp}, nil
+ return &pb.ListNewsAlertsReply{Alerts: alerts}, nil
}
diff --git a/server/backend/newsAlerts.go b/server/backend/newsAlerts.go
deleted file mode 100644
index c35f32a9..00000000
--- a/server/backend/newsAlerts.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package backend
-
-import (
- "context"
- "errors"
-
- pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
- "github.com/TUM-Dev/Campus-Backend/server/model"
- log "github.com/sirupsen/logrus"
- "google.golang.org/grpc/codes"
- "google.golang.org/grpc/status"
- "google.golang.org/protobuf/types/known/emptypb"
- "google.golang.org/protobuf/types/known/timestamppb"
- "gorm.io/gorm"
-)
-
-func (s *CampusServer) GetTopNews(ctx context.Context, _ *emptypb.Empty) (*pb.GetTopNewsReply, error) {
- if err := s.checkDevice(ctx); err != nil {
- return nil, err
- }
-
- var res *model.NewsAlert
- err := s.db.Joins("Files").Where("NOW() between `from` and `to`").First(&res).Error
- if errors.Is(err, gorm.ErrRecordNotFound) {
- return nil, status.Error(codes.NotFound, "no current active top news")
- } else if err != nil {
- log.WithError(err).Error("could not GetTopNews")
- return nil, status.Error(codes.Internal, "could not GetTopNews")
- }
-
- return &pb.GetTopNewsReply{
- ImageUrl: res.Files.URL.String,
- Link: res.Link.String,
- Created: timestamppb.New(res.Created),
- From: timestamppb.New(res.From),
- To: timestamppb.New(res.To),
- }, nil
-}
diff --git a/server/backend/newsAlerts_test.go b/server/backend/newsAlerts_test.go
deleted file mode 100644
index 68c7e1eb..00000000
--- a/server/backend/newsAlerts_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package backend
-
-import (
- "context"
- "database/sql"
- "regexp"
- "testing"
- "time"
-
- "github.com/DATA-DOG/go-sqlmock"
- pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
- "github.com/TUM-Dev/Campus-Backend/server/model"
- "github.com/guregu/null"
- "github.com/stretchr/testify/require"
- "github.com/stretchr/testify/suite"
- "google.golang.org/grpc/codes"
- "google.golang.org/grpc/metadata"
- "google.golang.org/grpc/status"
- "google.golang.org/protobuf/types/known/timestamppb"
- "gorm.io/driver/mysql"
- "gorm.io/gorm"
-)
-
-type NewsAlertSuite struct {
- suite.Suite
- DB *gorm.DB
- mock sqlmock.Sqlmock
- deviceBuf *deviceBuffer
-}
-
-func (s *NewsAlertSuite) SetupSuite() {
- var (
- db *sql.DB
- err error
- )
-
- db, s.mock, err = sqlmock.New()
- require.NoError(s.T(), err)
-
- dialector := mysql.New(mysql.Config{
- Conn: db,
- DriverName: "mysql",
- })
- s.mock.ExpectQuery("SELECT VERSION()").
- WillReturnRows(sqlmock.NewRows([]string{"VERSION()"}).AddRow("10.11.4-MariaDB"))
- s.DB, err = gorm.Open(dialector, &gorm.Config{})
- require.NoError(s.T(), err)
-
- s.deviceBuf = newDeviceBuffer()
-}
-
-const ExpectedGetTopNewsQuery = "SELECT `news_alert`.`news_alert`,`news_alert`.`file`,`news_alert`.`name`,`news_alert`.`link`,`news_alert`.`created`,`news_alert`.`from`,`news_alert`.`to`,`Files`.`file` AS `Files__file`,`Files`.`name` AS `Files__name`,`Files`.`path` AS `Files__path`,`Files`.`downloads` AS `Files__downloads`,`Files`.`url` AS `Files__url`,`Files`.`downloaded` AS `Files__downloaded` FROM `news_alert` LEFT JOIN `files` `Files` ON `news_alert`.`file` = `Files`.`file` WHERE NOW() between `from` and `to` ORDER BY `news_alert`.`news_alert` LIMIT 1"
-
-func (s *NewsAlertSuite) Test_GetTopNewsOne() {
- expectedAlert := model.NewsAlert{
- NewsAlert: 1,
- FilesID: 3001,
- Files: model.Files{
- File: 3001,
- Name: "Tournament_app_02-02.png",
- Path: "newsalerts/",
- Downloads: 0,
- URL: sql.NullString{Valid: false},
- Downloaded: sql.NullBool{Bool: true, Valid: true},
- },
- Name: null.String{NullString: sql.NullString{String: "Exzellenzuniversität", Valid: true}},
- Link: null.String{NullString: sql.NullString{String: "https://tum.de", Valid: true}},
- Created: time.Time.Add(time.Now(), time.Hour*-4),
- From: time.Time.Add(time.Now(), time.Hour*-2),
- To: time.Time.Add(time.Now(), time.Hour*2),
- }
- s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedGetTopNewsQuery)).
- WillReturnRows(sqlmock.NewRows([]string{"news_alert", "file", "name", "link", "created", "from", "to", "Files__file", "Files__name", "Files__path", "Files__downloads", "Files__url", "Files__downloaded"}).
- AddRow(expectedAlert.NewsAlert, expectedAlert.FilesID, expectedAlert.Name, expectedAlert.Link, expectedAlert.Created, expectedAlert.From, expectedAlert.To, expectedAlert.Files.File, expectedAlert.Files.Name, expectedAlert.Files.Path, expectedAlert.Files.Downloads, expectedAlert.Files.URL, expectedAlert.Files.Downloaded))
-
- meta := metadata.MD{}
- server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
- response, err := server.GetTopNews(metadata.NewIncomingContext(context.Background(), meta), nil)
- require.NoError(s.T(), err)
- require.Equal(s.T(), &pb.GetTopNewsReply{
- ImageUrl: expectedAlert.Files.URL.String,
- Link: expectedAlert.Link.String,
- Created: timestamppb.New(expectedAlert.Created),
- From: timestamppb.New(expectedAlert.From),
- To: timestamppb.New(expectedAlert.To),
- }, response)
-}
-func (s *NewsAlertSuite) Test_GetTopNewsNone() {
- s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedGetTopNewsQuery)).WillReturnError(gorm.ErrRecordNotFound)
-
- meta := metadata.MD{}
- server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
- response, err := server.GetTopNews(metadata.NewIncomingContext(context.Background(), meta), nil)
- require.Equal(s.T(), status.Error(codes.NotFound, "no current active top news"), err)
- require.Nil(s.T(), response)
-}
-func (s *NewsAlertSuite) Test_GetTopNewsError() {
- s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedGetTopNewsQuery)).WillReturnError(gorm.ErrInvalidDB)
-
- meta := metadata.MD{}
- server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
- response, err := server.GetTopNews(metadata.NewIncomingContext(context.Background(), meta), nil)
- require.Equal(s.T(), status.Error(codes.Internal, "could not GetTopNews"), err)
- require.Nil(s.T(), response)
-}
-
-func (s *NewsAlertSuite) AfterTest(_, _ string) {
- require.NoError(s.T(), s.mock.ExpectationsWereMet())
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestNewsAlertSuite(t *testing.T) {
- suite.Run(t, new(NewsAlertSuite))
-}
diff --git a/server/backend/news_test.go b/server/backend/news_test.go
index 6345bf7a..62922c7c 100644
--- a/server/backend/news_test.go
+++ b/server/backend/news_test.go
@@ -6,6 +6,12 @@ import (
"fmt"
"regexp"
"testing"
+ "time"
+
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
+
+ "google.golang.org/protobuf/types/known/timestamppb"
"github.com/DATA-DOG/go-sqlmock"
pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
@@ -46,74 +52,226 @@ func (s *NewsSuite) SetupSuite() {
s.deviceBuf = newDeviceBuffer()
}
-func file(id int32) *model.Files {
- return &model.Files{
+func newsFile(id int64) *model.File {
+ return &model.File{
File: id,
Name: fmt.Sprintf("src_%d.png", id),
- Path: "news/sources",
+ Path: "news/sources/",
Downloads: 1,
- URL: sql.NullString{Valid: false},
- Downloaded: sql.NullBool{Bool: true, Valid: true},
+ URL: null.String{},
+ Downloaded: null.BoolFrom(true),
}
}
func source1() *model.NewsSource {
return &model.NewsSource{
- Source: 1,
- Title: "Amazing News 1",
- URL: null.String{NullString: sql.NullString{String: "https://example.com/amazing1", Valid: true}},
- FilesID: file(2).File,
- Files: *file(2),
- Hook: null.String{NullString: sql.NullString{String: "", Valid: true}},
+ Source: 1,
+ Title: "Amazing News 1",
+ URL: null.StringFrom("https://example.com/amazing1"),
+ FileID: newsFile(1).File,
+ File: *newsFile(1),
+ Hook: null.StringFrom(""),
}
}
func source2() *model.NewsSource {
return &model.NewsSource{
- Source: 2,
- Title: "Amazing News 2",
- URL: null.String{NullString: sql.NullString{String: "https://example.com/amazing2", Valid: true}},
- FilesID: file(2).File,
- Files: *file(2),
- Hook: null.String{NullString: sql.NullString{String: "hook", Valid: true}},
+ Source: 2,
+ Title: "Amazing News 2",
+ URL: null.StringFrom("https://example.com/amazing2"),
+ FileID: newsFile(2).File,
+ File: *newsFile(2),
+ Hook: null.StringFrom("hook"),
}
}
-const ExpectedGetSourceQuery = "SELECT `newsSource`.`source`,`newsSource`.`title`,`newsSource`.`url`,`newsSource`.`icon`,`newsSource`.`hook`,`Files`.`file` AS `Files__file`,`Files`.`name` AS `Files__name`,`Files`.`path` AS `Files__path`,`Files`.`downloads` AS `Files__downloads`,`Files`.`url` AS `Files__url`,`Files`.`downloaded` AS `Files__downloaded` FROM `newsSource` LEFT JOIN `files` `Files` ON `newsSource`.`icon` = `Files`.`file`"
+const ExpectedListNewsSourcesQuery = "SELECT `newsSource`.`source`,`newsSource`.`title`,`newsSource`.`url`,`newsSource`.`icon`,`newsSource`.`hook`,`File`.`file` AS `File__file`,`File`.`name` AS `File__name`,`File`.`path` AS `File__path`,`File`.`downloads` AS `File__downloads`,`File`.`url` AS `File__url`,`File`.`downloaded` AS `File__downloaded` FROM `newsSource` LEFT JOIN `files` `File` ON `newsSource`.`icon` = `File`.`file`"
-func (s *NewsSuite) Test_GetNewsSourcesMultiple() {
- s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedGetSourceQuery)).
- WillReturnRows(sqlmock.NewRows([]string{"source", "title", "url", "icon", "hook", "Files__file", "Files__name", "Files__path", "Files__downloads", "Files__url", "Files__downloaded"}).
- AddRow(source1().Source, source1().Title, source1().URL, source1().FilesID, source1().Hook, source1().Files.File, source1().Files.Name, source1().Files.Path, source1().Files.Downloads, source1().Files.URL, source1().Files.Downloaded).
- AddRow(source2().Source, source2().Title, source2().URL, source2().FilesID, source2().Hook, source2().Files.File, source2().Files.Name, source2().Files.Path, source2().Files.Downloads, source2().Files.URL, source2().Files.Downloaded))
+func (s *NewsSuite) Test_ListNewsSourcesMultiple() {
+ s1, s2 := source1(), source2()
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsSourcesQuery)).
+ WillReturnRows(sqlmock.NewRows([]string{"source", "title", "url", "icon", "hook", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded"}).
+ AddRow(s1.Source, s1.Title, s1.URL, s1.FileID, s1.Hook, s1.File.File, s1.File.Name, s1.File.Path, s1.File.Downloads, s1.File.URL, s1.File.Downloaded).
+ AddRow(s2.Source, s2.Title, s2.URL, s2.FileID, s2.Hook, s2.File.File, s2.File.Name, s2.File.Path, s2.File.Downloads, s2.File.URL, s2.File.Downloaded))
meta := metadata.MD{}
server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
- response, err := server.GetNewsSources(metadata.NewIncomingContext(context.Background(), meta), nil)
+ response, err := server.ListNewsSources(metadata.NewIncomingContext(context.Background(), meta), nil)
require.NoError(s.T(), err)
- expectedResp := &pb.NewsSourceReply{
+ expectedResp := &pb.ListNewsSourcesReply{
Sources: []*pb.NewsSource{
- {Source: fmt.Sprintf("%d", source1().Source), Title: source1().Title, Icon: source1().Files.URL.String},
- {Source: fmt.Sprintf("%d", source2().Source), Title: source2().Title, Icon: source2().Files.URL.String},
+ {Source: fmt.Sprintf("%d", s1.Source), Title: s1.Title, IconUrl: "https://api.tum.app/files/news/sources/src_1.png"},
+ {Source: fmt.Sprintf("%d", s2.Source), Title: s2.Title, IconUrl: "https://api.tum.app/files/news/sources/src_2.png"},
},
}
require.Equal(s.T(), expectedResp, response)
}
-func (s *NewsSuite) Test_GetNewsSourcesNone() {
- s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedGetSourceQuery)).
- WillReturnRows(sqlmock.NewRows([]string{"source", "title", "url", "icon", "hook", "Files__file", "Files__name", "Files__path", "Files__downloads", "Files__url", "Files__downloaded"}))
+func news1() *model.News {
+ return &model.News{
+ News: 1,
+ Title: "Amazing News 1",
+ Link: "https://example.com/amazing2",
+ FileID: null.IntFrom(newsFile(1).File),
+ File: newsFile(1),
+ }
+}
+
+func news2() *model.News {
+ return &model.News{
+ News: 2,
+ Title: "Amazing News 2",
+ Link: "https://example.com/amazing2",
+ FileID: null.Int{},
+ File: nil,
+ }
+}
+
+func (s *NewsSuite) Test_ListNewsSourcesNone() {
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsSourcesQuery)).
+ WillReturnRows(sqlmock.NewRows([]string{"source", "title", "url", "icon", "hook", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded"}))
meta := metadata.MD{}
server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
- response, err := server.GetNewsSources(metadata.NewIncomingContext(context.Background(), meta), nil)
+ response, err := server.ListNewsSources(metadata.NewIncomingContext(context.Background(), meta), nil)
require.NoError(s.T(), err)
- expectedResp := &pb.NewsSourceReply{
+ expectedResp := &pb.ListNewsSourcesReply{
Sources: []*pb.NewsSource(nil),
}
require.Equal(s.T(), expectedResp, response)
}
+const ExpectedListNewsQuery = "SELECT `news`.`news`,`news`.`date`,`news`.`created`,`news`.`title`,`news`.`description`,`news`.`src`,`news`.`link`,`news`.`image`,`news`.`file`,`File`.`file` AS `File__file`,`File`.`name` AS `File__name`,`File`.`path` AS `File__path`,`File`.`downloads` AS `File__downloads`,`File`.`url` AS `File__url`,`File`.`downloaded` AS `File__downloaded`,`NewsSource`.`source` AS `NewsSource__source`,`NewsSource`.`title` AS `NewsSource__title`,`NewsSource`.`url` AS `NewsSource__url`,`NewsSource`.`icon` AS `NewsSource__icon`,`NewsSource`.`hook` AS `NewsSource__hook`,`NewsSource__File`.`file` AS `NewsSource__File__file`,`NewsSource__File`.`name` AS `NewsSource__File__name`,`NewsSource__File`.`path` AS `NewsSource__File__path`,`NewsSource__File`.`downloads` AS `NewsSource__File__downloads`,`NewsSource__File`.`url` AS `NewsSource__File__url`,`NewsSource__File`.`downloaded` AS `NewsSource__File__downloaded` FROM `news` LEFT JOIN `files` `File` ON `news`.`file` = `File`.`file` LEFT JOIN `newsSource` `NewsSource` ON `news`.`src` = `NewsSource`.`source` LEFT JOIN `files` `NewsSource__File` ON `NewsSource`.`icon` = `NewsSource__File`.`file`"
+
+func (s *NewsSuite) Test_ListNewsNone_withFilters() {
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsQuery+" WHERE src = ? AND news > ?")).
+ WithArgs(1, 2).
+ WillReturnRows(sqlmock.NewRows([]string{"news", "date", "created", "title", "description", "src", "link", "image", "file", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded", "source", "NewsSource__source", "NewsSource__title", "NewsSource__url", "NewsSource__icon", "NewsSource__hook", "NewsSource__File__file", "NewsSource__File__name", "NewsSource__File__path", "NewsSource__File__downloads", "NewsSource__File__url", "NewsSource__File__downloaded"}))
+
+ meta := metadata.NewIncomingContext(context.Background(), metadata.MD{})
+ server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
+ response, err := server.ListNews(meta, &pb.ListNewsRequest{NewsSource: 1, LastNewsId: 2})
+ require.NoError(s.T(), err)
+ expectedResp := &pb.ListNewsReply{
+ News: []*pb.News{},
+ }
+ require.Equal(s.T(), expectedResp, response)
+}
+func (s *NewsSuite) Test_ListNewsNone() {
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsQuery)).
+ WillReturnRows(sqlmock.NewRows([]string{"news", "date", "created", "title", "description", "src", "link", "image", "file", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded", "source", "NewsSource__source", "NewsSource__title", "NewsSource__url", "NewsSource__icon", "NewsSource__hook", "NewsSource__File__file", "NewsSource__File__name", "NewsSource__File__path", "NewsSource__File__downloads", "NewsSource__File__url", "NewsSource__File__downloaded"}))
+
+ meta := metadata.NewIncomingContext(context.Background(), metadata.MD{})
+ server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
+ response, err := server.ListNews(meta, &pb.ListNewsRequest{})
+ require.NoError(s.T(), err)
+ expectedResp := &pb.ListNewsReply{
+ News: []*pb.News{},
+ }
+ require.Equal(s.T(), expectedResp, response)
+}
+func (s *NewsSuite) Test_ListNewsMultiple() {
+ n1 := news1()
+ n2 := news2()
+ s.mock.ExpectQuery(regexp.QuoteMeta(" ")).
+ WillReturnRows(sqlmock.NewRows([]string{"news", "date", "created", "title", "description", "src", "link", "image", "file", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded"}).
+ AddRow(n1.News, n1.Date, n1.Created, n1.Title, n1.Description, n1.NewsSourceID, n1.Link, n1.Image, n1.FileID, n1.File.File, n1.File.Name, n1.File.Path, n1.File.Downloads, n1.File.URL, n1.File.Downloaded).
+ AddRow(n2.News, n2.Date, n2.Created, n2.Title, n2.Description, n2.NewsSourceID, n2.Link, n2.Image, nil, nil, nil, nil, nil, nil, nil))
+
+ meta := metadata.NewIncomingContext(context.Background(), metadata.MD{})
+ server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
+ response, err := server.ListNews(meta, &pb.ListNewsRequest{})
+ require.NoError(s.T(), err)
+ expectedResp := &pb.ListNewsReply{
+ News: []*pb.News{
+ {Id: n1.News, Title: n1.Title, Text: n1.Description, Link: n1.Link, ImageUrl: "https://api.tum.app/files/news/sources/src_1.png", SourceId: fmt.Sprintf("%d", n1.NewsSourceID), SourceIconUrl: n1.NewsSource.File.FullExternalUrl(), SourceTitle: n1.NewsSource.Title, Created: timestamppb.New(n1.Created), Date: timestamppb.New(n1.Date)},
+ {Id: n2.News, Title: n2.Title, Text: n2.Description, Link: n2.Link, ImageUrl: "", SourceId: fmt.Sprintf("%d", n2.NewsSourceID), SourceIconUrl: n2.NewsSource.File.FullExternalUrl(), SourceTitle: n2.NewsSource.Title, Created: timestamppb.New(n2.Created), Date: timestamppb.New(n2.Date)},
+ },
+ }
+ require.Equal(s.T(), expectedResp, response)
+}
+
+func newsAlertFile(id int64) *model.File {
+ return &model.File{
+ File: id,
+ Name: fmt.Sprintf("src_%d.png", id),
+ Path: "news/sources/",
+ Downloads: 1,
+ URL: null.String{},
+ Downloaded: null.BoolFrom(true),
+ }
+}
+func alert1() *model.NewsAlert {
+ return &model.NewsAlert{
+ NewsAlert: 1,
+ FileID: newsAlertFile(1).File,
+ File: *newsAlertFile(1),
+ Name: null.String{},
+ Link: null.String{},
+ Created: time.Time.Add(time.Now(), time.Hour*-4),
+ From: time.Time.Add(time.Now(), time.Hour*-2),
+ To: time.Time.Add(time.Now(), time.Hour*-2),
+ }
+}
+
+func alert2() *model.NewsAlert {
+ return &model.NewsAlert{
+ NewsAlert: 2,
+ FileID: newsAlertFile(2).File,
+ File: *newsAlertFile(2),
+ Name: null.String{},
+ Link: null.String{},
+ Created: time.Time.Add(time.Now(), time.Hour),
+ From: time.Time.Add(time.Now(), time.Hour*2),
+ To: time.Time.Add(time.Now(), time.Hour*3),
+ }
+}
+
+const ExpectedListNewsAlertsQuery = "SELECT `news_alert`.`news_alert`,`news_alert`.`file`,`news_alert`.`name`,`news_alert`.`link`,`news_alert`.`created`,`news_alert`.`from`,`news_alert`.`to`,`File`.`file` AS `File__file`,`File`.`name` AS `File__name`,`File`.`path` AS `File__path`,`File`.`downloads` AS `File__downloads`,`File`.`url` AS `File__url`,`File`.`downloaded` AS `File__downloaded` FROM `news_alert` LEFT JOIN `files` `File` ON `news_alert`.`file` = `File`.`file` WHERE news_alert.to >= NOW()"
+
+func (s *NewsSuite) Test_ListNewsAlertsError() {
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsAlertsQuery)).WillReturnError(gorm.ErrInvalidDB)
+
+ meta := metadata.MD{}
+ server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
+ response, err := server.ListNewsAlerts(metadata.NewIncomingContext(context.Background(), meta), &pb.ListNewsAlertsRequest{})
+ require.Equal(s.T(), status.Error(codes.Internal, "could not ListNewsAlerts"), err)
+ require.Nil(s.T(), response)
+}
+func (s *NewsSuite) Test_ListNewsAlertsNone_noFilter() {
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsAlertsQuery)).WillReturnError(gorm.ErrRecordNotFound)
+
+ server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
+ response, err := server.ListNewsAlerts(metadata.NewIncomingContext(context.Background(), metadata.MD{}), &pb.ListNewsAlertsRequest{})
+ require.Equal(s.T(), status.Error(codes.NotFound, "no news alerts"), err)
+ require.Nil(s.T(), response)
+}
+func (s *NewsSuite) Test_ListNewsAlertsNone_Filter() {
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsAlertsQuery + " AND news_alert.news_alert > ?")).WithArgs(42).WillReturnError(gorm.ErrRecordNotFound)
+
+ server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
+ response, err := server.ListNewsAlerts(metadata.NewIncomingContext(context.Background(), metadata.MD{}), &pb.ListNewsAlertsRequest{LastNewsAlertId: 42})
+ require.Equal(s.T(), status.Error(codes.NotFound, "no news alerts"), err)
+ require.Nil(s.T(), response)
+}
+func (s *NewsSuite) Test_ListNewsAlertsMultiple() {
+ a1, a2 := alert1(), alert2()
+ s.mock.ExpectQuery(regexp.QuoteMeta(ExpectedListNewsAlertsQuery)).
+ WillReturnRows(sqlmock.NewRows([]string{"news_alert", "file", "name", "link", "created", "from", "to", "File__file", "File__name", "File__path", "File__downloads", "File__url", "File__downloaded"}).
+ AddRow(a1.NewsAlert, a1.FileID, a1.Name, a1.Link, a1.Created, a1.From, a1.To, a1.File.File, a1.File.Name, a1.File.Path, a1.File.Downloads, a1.File.URL, a1.File.Downloaded).
+ AddRow(a2.NewsAlert, a2.FileID, a2.Name, a2.Link, a2.Created, a2.From, a2.To, a2.File.File, a2.File.Name, a2.File.Path, a2.File.Downloads, a2.File.URL, a2.File.Downloaded))
+
+ server := CampusServer{db: s.DB, deviceBuf: s.deviceBuf}
+ response, err := server.ListNewsAlerts(metadata.NewIncomingContext(context.Background(), metadata.MD{}), &pb.ListNewsAlertsRequest{})
+ require.NoError(s.T(), err)
+ expectedResp := &pb.ListNewsAlertsReply{
+ Alerts: []*pb.NewsAlert{
+ {ImageUrl: "https://api.tum.app/files/news/sources/src_1.png", Link: a1.Link.String, Created: timestamppb.New(a1.Created), From: timestamppb.New(a1.From), To: timestamppb.New(a1.To)},
+ {ImageUrl: "https://api.tum.app/files/news/sources/src_2.png", Link: a2.Link.String, Created: timestamppb.New(a2.Created), From: timestamppb.New(a2.From), To: timestamppb.New(a2.To)},
+ }}
+ require.Equal(s.T(), expectedResp, response)
+}
+
func (s *NewsSuite) AfterTest(_, _ string) {
require.NoError(s.T(), s.mock.ExpectationsWereMet())
}
diff --git a/server/backend/rpcserver.go b/server/backend/rpcserver.go
index 1a29439e..aed6b256 100644
--- a/server/backend/rpcserver.go
+++ b/server/backend/rpcserver.go
@@ -3,28 +3,16 @@ package backend
import (
"context"
"errors"
- "net"
pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_apns/ios_apns_jwt"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/apns"
"github.com/TUM-Dev/Campus-Backend/server/model"
log "github.com/sirupsen/logrus"
- "google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"gorm.io/gorm"
)
-func (s *CampusServer) GRPCServe(l net.Listener) error {
- grpcServer := grpc.NewServer()
- pb.RegisterCampusServer(grpcServer, s)
- if err := grpcServer.Serve(l); err != nil {
- log.WithError(err).Fatal("failed to serve")
- }
- return grpcServer.Serve(l)
-}
-
type CampusServer struct {
pb.UnimplementedCampusServer
db *gorm.DB
@@ -37,8 +25,6 @@ var _ pb.CampusServer = (*CampusServer)(nil)
func New(db *gorm.DB) *CampusServer {
log.Trace("Server starting up")
- initTagRatingOptions(db)
-
return &CampusServer{
db: db,
deviceBuf: newDeviceBuffer(),
@@ -47,7 +33,7 @@ func New(db *gorm.DB) *CampusServer {
}
func NewIOSNotificationsService() *IOSNotificationsService {
- if err := ios_apns.ValidateRequirementsForIOSNotificationsService(); err != nil {
+ if err := apns.ValidateRequirementsForIOSNotificationsService(); err != nil {
log.WithError(err).Warn("failed to validate requirements for ios notifications service")
return &IOSNotificationsService{
@@ -56,9 +42,9 @@ func NewIOSNotificationsService() *IOSNotificationsService {
}
}
- token, err := ios_apns_jwt.NewToken()
+ token, err := apns.NewToken()
if err != nil {
- log.WithError(err).Fatal("failed to create new token")
+ log.WithError(err).Error("failed to create new token")
}
return &IOSNotificationsService{
@@ -80,7 +66,7 @@ func (s *CampusServer) SearchRooms(ctx context.Context, req *pb.SearchRoomsReque
Campus string
Name string
}
- err := s.db.Raw("SELECT r.*, a.campus, a.name "+
+ err := s.db.WithContext(ctx).Raw("SELECT r.*, a.campus, a.name "+
"FROM roomfinder_rooms r "+
"LEFT JOIN roomfinder_building2area a ON a.building_nr = r.building_nr "+
"WHERE MATCH(room_code, info, address) AGAINST(?)", req.Query).Scan(&res).Error
diff --git a/server/backend/updateNote.go b/server/backend/update_note.go
similarity index 90%
rename from server/backend/updateNote.go
rename to server/backend/update_note.go
index a9f48164..70d1fbb7 100644
--- a/server/backend/updateNote.go
+++ b/server/backend/update_note.go
@@ -19,7 +19,7 @@ func (s *CampusServer) GetUpdateNote(ctx context.Context, req *pb.GetUpdateNoteR
}
res := model.UpdateNote{VersionCode: req.Version}
- if err := s.db.First(&res).Error; errors.Is(err, gorm.ErrRecordNotFound) {
+ if err := s.db.WithContext(ctx).First(&res).Error; errors.Is(err, gorm.ErrRecordNotFound) {
return nil, status.Error(codes.NotFound, "No update note found")
} else if err != nil {
log.WithField("VersionCode", req.Version).WithError(err).Error("Failed to get update note")
diff --git a/server/backend/updateNews_test.go b/server/backend/update_note_test.go
similarity index 100%
rename from server/backend/updateNews_test.go
rename to server/backend/update_note_test.go
diff --git a/server/backend/validators.go b/server/backend/validators.go
index 042c0a1d..234216bb 100644
--- a/server/backend/validators.go
+++ b/server/backend/validators.go
@@ -6,7 +6,7 @@ import (
pb "github.com/TUM-Dev/Campus-Backend/server/api/tumdev"
)
-func ValidateRegisterDevice(request *pb.RegisterDeviceRequest) error {
+func ValidateCreateDevice(request *pb.CreateDeviceRequest) error {
if request.GetDeviceId() == "" {
return errors.New("deviceId is empty")
}
@@ -18,7 +18,7 @@ func ValidateRegisterDevice(request *pb.RegisterDeviceRequest) error {
return nil
}
-func ValidateRemoveDevice(request *pb.RemoveDeviceRequest) error {
+func ValidateDeleteDevice(request *pb.DeleteDeviceRequest) error {
if request.GetDeviceId() == "" {
return errors.New("deviceId is empty")
}
diff --git a/server/go.mod b/server/go.mod
index e25b8ccb..2df4c17b 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -4,6 +4,7 @@ go 1.21
require (
github.com/DATA-DOG/go-sqlmock v1.5.0
+ github.com/PuerkitoBio/goquery v1.8.1
github.com/disintegration/imaging v1.6.2
github.com/gabriel-vasile/mimetype v1.4.2
github.com/getsentry/sentry-go v0.24.1
@@ -12,45 +13,49 @@ require (
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
github.com/guregu/null v4.0.0+incompatible
- github.com/influxdata/influxdb-client-go/v2 v2.12.3
github.com/makasim/sentryhook v0.4.2
github.com/microcosm-cc/bluemonday v1.0.25
github.com/mmcdole/gofeed v1.2.1
github.com/onrik/gorm-logrus v0.5.0
+ github.com/prometheus/client_golang v1.17.0
github.com/sirupsen/logrus v1.9.3
github.com/soheilhy/cmux v0.1.5
github.com/stretchr/testify v1.8.4
- golang.org/x/net v0.15.0
+ golang.org/x/net v0.17.0
golang.org/x/sync v0.3.0
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb
- google.golang.org/grpc v1.58.0
+ google.golang.org/grpc v1.58.2
google.golang.org/protobuf v1.31.0
+ gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
gorm.io/driver/mysql v1.5.1
gorm.io/gorm v1.25.4
)
require (
- github.com/PuerkitoBio/goquery v1.8.0 // indirect
github.com/andybalholm/cascadia v1.3.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/deepmap/oapi-codegen v1.8.2 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/gorilla/css v1.0.0 // indirect
- github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mmcdole/goxpp v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
- github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+ github.com/prometheus/common v0.44.0 // indirect
+ github.com/prometheus/procfs v0.11.1 // indirect
golang.org/x/image v0.5.0 // indirect
- golang.org/x/sys v0.12.0 // indirect
+ golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // 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
index 86e36c83..7749353f 100644
--- a/server/go.sum
+++ b/server/go.sum
@@ -46,8 +46,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20O
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U=
-github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
+github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
+github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
@@ -60,12 +60,16 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -83,15 +87,11 @@ github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU=
-github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk=
github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
@@ -114,14 +114,12 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
-github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
github.com/getsentry/sentry-go v0.17.0/go.mod h1:B82dxtBvxG0KaPD8/hfSV+VcHD+Lg/xUS4JuQn1P4cM=
github.com/getsentry/sentry-go v0.24.1 h1:W6/0GyTy8J6ge6lVCc94WB6Gx2ZuLrgopnn9w8Hiwuk=
github.com/getsentry/sentry-go v0.24.1/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -131,8 +129,6 @@ github.com/go-gormigrate/gormigrate/v2 v2.1.1 h1:eGS0WTFRV30r103lU8JNXY27KbviRnq
github.com/go-gormigrate/gormigrate/v2 v2.1.1/go.mod h1:L7nJ620PFDKei9QOhJzqA8kRCk+E3UbV2f5gv+1ndLc=
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
@@ -188,7 +184,6 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -232,7 +227,6 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
@@ -265,10 +259,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/influxdata/influxdb-client-go/v2 v2.12.3 h1:28nRlNMRIV4QbtIUvxhWqaxn0IpXeMSkY/uJa/O/vC4=
-github.com/influxdata/influxdb-client-go/v2 v2.12.3/go.mod h1:IrrLUbCjjfkmRuaCiGQg4m2GbkaeJDcuWoxiWdQEbA0=
-github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU=
-github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
github.com/iris-contrib/httpexpect/v2 v2.3.1/go.mod h1:ICTf89VBKSD3KB0fsyyHviKF8G8hyepP0dOXJPWz3T0=
github.com/iris-contrib/jade v1.1.4/go.mod h1:EDqR+ur9piDl6DUgs6qRrlfzmlx/D5UybogqrXvJTBE=
@@ -311,35 +301,26 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
-github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/mailgun/raymond/v2 v2.0.46/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/makasim/sentryhook v0.4.2 h1:rqx637SCMMV5mAd9PpSg0OUIpZZaQOQZ6JHONOpUlRI=
github.com/makasim/sentryhook v0.4.2/go.mod h1:AlAU2qjpS3R9bmpfVNcCVQw1tKkH8/lOPa2RQTk8Bzw=
-github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/mediocregopher/radix/v3 v3.8.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
github.com/microcosm-cc/bluemonday v1.0.20/go.mod h1:yfBmMi8mxvaZut3Yytv+jTXRY8mxyjJ0/kQBTElld50=
github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
@@ -406,12 +387,21 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
+github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
+github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -476,7 +466,6 @@ github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
@@ -519,8 +508,6 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -619,8 +606,9 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -655,7 +643,6 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -664,7 +651,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -674,7 +660,6 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -687,7 +672,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -698,7 +682,6 @@ golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -725,11 +708,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -747,7 +731,6 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -905,8 +888,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=
-google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
+google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -923,6 +906,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -931,6 +916,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
diff --git a/server/main.go b/server/main.go
index 9e624b66..01b65ca0 100644
--- a/server/main.go
+++ b/server/main.go
@@ -4,8 +4,6 @@ import (
"context"
"embed"
"encoding/json"
- "errors"
- "io/fs"
"net"
"net/http"
"net/textproto"
@@ -13,6 +11,10 @@ import (
"strings"
"time"
+ "google.golang.org/grpc/reflection"
+
+ "github.com/prometheus/client_golang/prometheus/promhttp"
+
"github.com/TUM-Dev/Campus-Backend/server/env"
"github.com/makasim/sentryhook"
@@ -45,17 +47,7 @@ var swagfs embed.FS
func main() {
setupTelemetry()
- defer sentry.Flush(2 * time.Second) // make sure that sentry handles shutdowns gracefully
-
- // initializing connection to InfluxDB
- err := backend.ConnectToInfluxDB()
- if errors.Is(err, backend.ErrInfluxTokenNotConfigured) {
- log.Warn("InfluxDB token not configured - continuing without InfluxDB")
- } else if errors.Is(err, backend.ErrInfluxURLNotConfigured) {
- log.Warn("InfluxDB url not configured - continuing without InfluxDB")
- } else if err != nil {
- log.WithError(err).Error("InfluxDB connection failed - health check failed")
- }
+ defer sentry.Flush(10 * time.Second) // make sure that sentry handles shutdowns gracefully
db := setupDB()
@@ -82,13 +74,16 @@ func main() {
httpMux.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
_, _ = w.Write([]byte("healthy"))
})
+ httpMux.Handle("/metrics", promhttp.Handler())
- static, _ := fs.Sub(swagfs, "swagger")
- httpMux.Handle("/", http.FileServer(http.FS(static)))
+ httpMux.Handle("/", http.RedirectHandler("/swagger/", http.StatusTemporaryRedirect))
+ httpMux.Handle("/files/", http.StripPrefix("/files/", http.FileServer(http.Dir("/Storage"))))
+ httpMux.Handle("/swagger/", http.FileServer(http.FS(swagfs)))
// Main GRPC Server
- grpcServer := grpc.NewServer()
+ grpcServer := grpc.NewServer(grpc.UnaryInterceptor(UnaryRequestLogger), grpc.StreamInterceptor(StreamRequestLogger))
pb.RegisterCampusServer(grpcServer, campusService)
+ reflection.Register(grpcServer)
// GRPC Gateway for HTTP REST -> GRPC
grpcGatewayMux := runtime.NewServeMux(runtime.WithIncomingHeaderMatcher(
@@ -108,7 +103,7 @@ func main() {
grpc.WithUnaryInterceptor(addMethodNameInterceptor),
}
if err := pb.RegisterCampusHandlerFromEndpoint(context.Background(), grpcGatewayMux, httpPort, opts); err != nil {
- log.WithError(err).Panic("could not RegisterCampusHandlerFromEndpoint")
+ log.WithError(err).Fatal("could not RegisterCampusHandlerFromEndpoint")
}
httpMux.Handle("/v1/", http.StripPrefix("/v1", grpcGatewayMux))
@@ -126,20 +121,31 @@ func main() {
}
}
+func UnaryRequestLogger(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+ start := time.Now()
+ resp, err := handler(ctx, req)
+ fields := log.Fields{"elapsed": time.Since(start)}
+ log.WithContext(ctx).WithFields(fields).WithError(err).Info(info.FullMethod)
+ return resp, err
+}
+func StreamRequestLogger(srv any, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
+ start := time.Now()
+ err := handler(srv, stream)
+ log.WithField("elapsed", time.Since(start)).WithError(err).Info(info.FullMethod)
+ return err
+}
+
// setupDB connects to the database and migrates it if necessary
func setupDB() *gorm.DB {
- // Connect to DB
- var conn gorm.Dialector
- if dbHost := os.Getenv("DB_DSN"); dbHost == "" {
+ dbHost := os.Getenv("DB_DSN")
+ if dbHost == "" {
log.Fatal("Failed to start! The 'DB_DSN' environment variable is not defined. Take a look at the README.md for more details.")
- } else {
- log.Info("Connecting to dsn")
- conn = mysql.Open(dbHost)
}
- db, err := gorm.Open(conn, &gorm.Config{Logger: gorm_logrus.New()})
+ log.Info("Connecting to dsn")
+ db, err := gorm.Open(mysql.Open(dbHost), &gorm.Config{Logger: gorm_logrus.New()})
if err != nil {
- log.WithError(err).Panic("failed to connect database")
+ log.WithError(err).Fatal("failed to connect database")
}
// Migrate the schema
@@ -178,7 +184,7 @@ func setupTelemetry() {
}
}
-// addMethodNameInterceptor adds the method name (e.g. "GetNewsSources") to the metadata as x-campus-method for later use (currently logging the devices api usage)
+// addMethodNameInterceptor adds the method name (e.g. "ListNewsSources") to the metadata as x-campus-method for later use (currently logging the devices api usage)
func addMethodNameInterceptor(ctx context.Context, method string, req interface{}, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
ctx = metadata.AppendToOutgoingContext(ctx, "x-campus-method", method)
return invoker(ctx, method, req, reply, cc, opts...)
diff --git a/server/model/cafeteria.go b/server/model/cafeteria.go
index 7a5988e5..a5c59582 100644
--- a/server/model/cafeteria.go
+++ b/server/model/cafeteria.go
@@ -2,7 +2,7 @@ package model
// Cafeteria stores all Available cafeterias in the format of the eat-api
type Cafeteria struct {
- Cafeteria int32 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteria;type:int;not null;" json:"cafeteria" `
+ Cafeteria int64 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteria;type:int;not null;" json:"canteen" `
Name string `gorm:"column:name;type:mediumtext;not null;" json:"name" `
Address string `gorm:"column:address;type:text;not null;" json:"address" `
Latitude float32 `gorm:"column:latitude;type:float;not null;" json:"latitude" `
diff --git a/server/model/cafeteriaRatingAverage.go b/server/model/cafeteriaRatingAverage.go
deleted file mode 100644
index 98c5401c..00000000
--- a/server/model/cafeteriaRatingAverage.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package model
-
-// CafeteriaRatingAverage stores all precomputed values for the cafeteria ratings
-type CafeteriaRatingAverage struct {
- CafeteriaRatingAverage int32 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingAverage;type:int;not null;" json:"cafeteriaRatingAverage" `
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
- Average float32 `gorm:"column:average;type:float;not null;" json:"average" `
- Min int8 `gorm:"column:min;type:int;not null;" json:"min"`
- Max int8 `gorm:"column:max;type:int;not null;" json:"max"`
- Std float32 `gorm:"column:std;type:float;not null;" json:"std"`
-}
-
-// TableName sets the insert table name for this struct type
-func (n *CafeteriaRatingAverage) TableName() string {
- return "cafeteria_rating_average"
-}
diff --git a/server/model/cafeteriaRating.go b/server/model/cafeteria_rating.go
similarity index 71%
rename from server/model/cafeteriaRating.go
rename to server/model/cafeteria_rating.go
index 1916d6b4..cfa5f686 100644
--- a/server/model/cafeteriaRating.go
+++ b/server/model/cafeteria_rating.go
@@ -6,10 +6,10 @@ import (
// CafeteriaRating stores all Available cafeterias in the format of the eat-api
type CafeteriaRating struct {
- CafeteriaRating int32 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRating;type:int;not null;" json:"cafeteriarating"`
+ CafeteriaRating int64 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRating;type:int;not null;" json:"canteenrating"`
Points int32 `gorm:"column:points;type:int;not null;" json:"points"`
Comment string `gorm:"column:comment;type:text;" json:"comment" `
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"canteenID"`
Timestamp time.Time `gorm:"column:timestamp;type:timestamp;not null;" json:"timestamp" `
Image string `gorm:"column:image;type:text;" json:"image"`
}
diff --git a/server/model/cafeteria_rating_average.go b/server/model/cafeteria_rating_average.go
new file mode 100644
index 00000000..cb624a95
--- /dev/null
+++ b/server/model/cafeteria_rating_average.go
@@ -0,0 +1,16 @@
+package model
+
+// CafeteriaRatingAverage stores all precomputed values for the cafeteria ratings
+type CafeteriaRatingAverage struct {
+ CafeteriaRatingAverage int64 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingAverage;type:int;not null;" json:"canteenRatingAverage" `
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"canteenID"`
+ Average float64 `gorm:"column:average;type:float;not null;" json:"average" `
+ Min int32 `gorm:"column:min;type:int;not null;" json:"min"`
+ Max int32 `gorm:"column:max;type:int;not null;" json:"max"`
+ Std float64 `gorm:"column:std;type:float;not null;" json:"std"`
+}
+
+// TableName sets the insert table name for this struct type
+func (n *CafeteriaRatingAverage) TableName() string {
+ return "cafeteria_rating_average"
+}
diff --git a/server/model/cafeteriaRatingTag.go b/server/model/cafeteria_rating_tag.go
similarity index 67%
rename from server/model/cafeteriaRatingTag.go
rename to server/model/cafeteria_rating_tag.go
index d266d776..15e964b6 100644
--- a/server/model/cafeteriaRatingTag.go
+++ b/server/model/cafeteria_rating_tag.go
@@ -2,10 +2,10 @@ package model
// CafeteriaRatingTag struct is a row record of the either the dish_tag_rating-table or the cafeteria_rating_tags-table in the database
type CafeteriaRatingTag struct {
- CafeteriaRatingTag int32 `gorm:"primary_key;AUTO_INCREMENT;column:CafeteriaRatingTag;type:int;not null;" json:"CafeteriaRatingTag" `
- CorrespondingRating int32 `gorm:"foreignKey:cafeteriaRatingID;column:correspondingRating;type:int;not null;" json:"correspondingRating"`
+ CafeteriaRatingTag int64 `gorm:"primary_key;AUTO_INCREMENT;column:CafeteriaRatingTag;type:int;not null;" json:"CanteenRatingTag" `
+ CorrespondingRating int64 `gorm:"foreignKey:cafeteriaRatingID;column:correspondingRating;type:int;not null;" json:"correspondingRating"`
Points int32 `gorm:"column:points;type:int;not null;" json:"points"`
- TagID int `gorm:"foreignKey:cafeteriaRatingTagOption;column:tagID;type:int;not null;" json:"tagID"`
+ TagID int64 `gorm:"foreignKey:cafeteriaRatingTagOption;column:tagID;type:int;not null;" json:"tagID"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/cafeteriaRatingTagAverage.go b/server/model/cafeteria_rating_tag_average.go
similarity index 70%
rename from server/model/cafeteriaRatingTagAverage.go
rename to server/model/cafeteria_rating_tag_average.go
index 56491327..6c1abeb7 100644
--- a/server/model/cafeteriaRatingTagAverage.go
+++ b/server/model/cafeteria_rating_tag_average.go
@@ -2,10 +2,10 @@ package model
// CafeteriaRatingTagsAverage stores all precomputed values for the cafeteria ratings
type CafeteriaRatingTagsAverage struct {
- CafeteriaRatingTagsAverage int32 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingTagsAverage;type:int;not null;" json:"cafeteriaRatingTagsAverage" `
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
- TagID int32 `gorm:"column:tagID;foreignKey:cafeteriaRatingTagOption;type:int;not null;" json:"tagID"`
- Average float32 `gorm:"column:average;type:float;not null;" json:"average" `
+ CafeteriaRatingTagsAverage int64 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingTagsAverage;type:int;not null;" json:"canteenRatingTagsAverage"`
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"canteenID"`
+ TagID int64 `gorm:"column:tagID;foreignKey:cafeteriaRatingTagOption;type:int;not null;" json:"tagID"`
+ Average float32 `gorm:"column:average;type:float;not null;" json:"average"`
Min int8 `gorm:"column:min;type:int;not null;" json:"min"`
Max int8 `gorm:"column:max;type:int;not null;" json:"max"`
Std float32 `gorm:"column:std;type:float;not null;" json:"std"`
diff --git a/server/model/cafeteriaRatingTagOptions.go b/server/model/cafeteria_rating_tag_options.go
similarity index 86%
rename from server/model/cafeteriaRatingTagOptions.go
rename to server/model/cafeteria_rating_tag_options.go
index 0760ec34..e5d27d49 100644
--- a/server/model/cafeteriaRatingTagOptions.go
+++ b/server/model/cafeteria_rating_tag_options.go
@@ -2,7 +2,7 @@ package model
// CafeteriaRatingTagOption stores all available options for tags which can be used to quickly rate cafeterias
type CafeteriaRatingTagOption struct {
- CafeteriaRatingsTagOption int32 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingTagOption;type:int;not null;" json:"cafeteriaRatingTagOption"`
+ CafeteriaRatingsTagOption int64 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingTagOption;type:int;not null;" json:"canteenRatingTagOption"`
DE string `gorm:"column:DE;text;default:de;not null;" json:"DE"`
EN string `gorm:"column:EN;text;default:en;not null;" json:"EN"`
}
diff --git a/server/model/canteenHeadCount.go b/server/model/canteen_head_count.go
similarity index 100%
rename from server/model/canteenHeadCount.go
rename to server/model/canteen_head_count.go
diff --git a/server/model/crontab.go b/server/model/crontab.go
index 6e775f14..79d310af 100644
--- a/server/model/crontab.go
+++ b/server/model/crontab.go
@@ -11,9 +11,9 @@ func (Crontab) TableName() string {
// Crontab struct is a row record of the crontab table in the tca database
type Crontab struct {
- Cron int32 `gorm:"primary_key;AUTO_INCREMENT;column:cron;type:int;" json:"cron"`
+ Cron int64 `gorm:"primary_key;AUTO_INCREMENT;column:cron;type:int;" json:"cron"`
Interval int32 `gorm:"column:interval;type:int;default:7200;" json:"interval"`
LastRun int32 `gorm:"column:lastRun;type:int;default:0;" json:"last_run"`
- Type null.String `gorm:"column:type;type:enum ('news', 'mensa', 'kino', 'roomfinder', 'alarm', 'fileDownload','dishNameDownload','averageRatingComputation', 'iosNotifications', 'iosActivityReset', 'canteenHeadCount');" json:"type"`
+ Type null.String `gorm:"column:type;type:enum ('news', 'mensa', 'movie', 'roomfinder', 'alarm', 'fileDownload','dishNameDownload','averageRatingComputation', 'iosNotifications', 'iosActivityReset', 'canteenHeadCount', 'newExamResultsHook');" json:"type"`
ID null.Int `gorm:"column:id;type:int;" json:"id"`
}
diff --git a/server/model/devices.go b/server/model/devices.go
index 213330be..205a5ae9 100755
--- a/server/model/devices.go
+++ b/server/model/devices.go
@@ -8,7 +8,7 @@ import (
// Devices struct is a row record of the devices table in the tca database
type Devices struct {
- Device int32 `gorm:"primary_key;AUTO_INCREMENT;column:device;type:int;" json:"device"`
+ Device int64 `gorm:"primary_key;AUTO_INCREMENT;column:device;type:int;" json:"device"`
Member null.Int `gorm:"column:member;type:int;" json:"member"`
UUID string `gorm:"column:uuid;type:varchar(50);" json:"uuid"`
Created null.Time `gorm:"column:created;type:timestamp;" json:"created"`
diff --git a/server/model/dish.go b/server/model/dish.go
index cb787aad..7ab5c4d7 100644
--- a/server/model/dish.go
+++ b/server/model/dish.go
@@ -13,10 +13,10 @@ var (
// Dish represents one dish fin a specific cafeteria
type Dish struct {
- Dish int32 `gorm:"primary_key;AUTO_INCREMENT;column:dish;type:int;not null;" json:"dish"`
+ Dish int64 `gorm:"primary_key;AUTO_INCREMENT;column:dish;type:int;not null;" json:"dish"`
Name string `gorm:"column:name;type:text;not null;" json:"name" `
Type string `gorm:"column:type;type:text;not null;" json:"type" `
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/dishNameTag.go b/server/model/dish_name_tag.go
similarity index 68%
rename from server/model/dishNameTag.go
rename to server/model/dish_name_tag.go
index f7795451..1dc52ab4 100644
--- a/server/model/dishNameTag.go
+++ b/server/model/dish_name_tag.go
@@ -1,10 +1,10 @@
package model
type DishNameTag struct {
- DishNameTag int32 `gorm:"primary_key;AUTO_INCREMENT;column:DishNameTag;type:int;not null;" json:"DishNameTag"`
- CorrespondingRating int32 `gorm:"foreignKey:dish;column:correspondingRating;type:int;not null;" json:"correspondingRating"`
+ DishNameTag int64 `gorm:"primary_key;AUTO_INCREMENT;column:DishNameTag;type:int;not null;" json:"DishNameTag"`
+ CorrespondingRating int64 `gorm:"foreignKey:dish;column:correspondingRating;type:int;not null;" json:"correspondingRating"`
Points int32 `gorm:"column:points;type:int;not null;" json:"points"`
- TagNameID int `gorm:"foreignKey:tagRatingID;column:tagNameID;type:int;not null;" json:"tagnameID"`
+ TagNameID int64 `gorm:"foreignKey:tagRatingID;column:tagNameID;type:int;not null;" json:"tagnameID"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/dishNameTagAverage.go b/server/model/dish_name_tag_average.go
similarity index 80%
rename from server/model/dishNameTagAverage.go
rename to server/model/dish_name_tag_average.go
index 8fe17548..2ee05076 100644
--- a/server/model/dishNameTagAverage.go
+++ b/server/model/dish_name_tag_average.go
@@ -2,9 +2,9 @@ package model
// DishNameTagAverage stores all precomputed values for the DishName ratings
type DishNameTagAverage struct {
- DishNameTagAverage int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagAverage;type:int;not null;" json:"dishNameTagAverage" `
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
- TagID int32 `gorm:"column:tagID;foreignKey:DishNameTagOption;type:int;not null;" json:"tagID"`
+ DishNameTagAverage int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagAverage;type:int;not null;" json:"dishNameTagAverage" `
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
+ TagID int64 `gorm:"column:tagID;foreignKey:DishNameTagOption;type:int;not null;" json:"tagID"`
Average float32 `gorm:"column:average;type:float;not null;" json:"average" `
Min int8 `gorm:"column:min;type:int;not null;" json:"min"`
Max int8 `gorm:"column:max;type:int;not null;" json:"max"`
diff --git a/server/model/dishNameTagOption.go b/server/model/dish_name_tag_option.go
similarity index 72%
rename from server/model/dishNameTagOption.go
rename to server/model/dish_name_tag_option.go
index 17a14462..143eb8a4 100644
--- a/server/model/dishNameTagOption.go
+++ b/server/model/dish_name_tag_option.go
@@ -1,7 +1,7 @@
package model
type DishNameTagOption struct {
- DishNameTagOption int32 `gorm:"column:dishNameTagOption;type:int;primary_key;AUTO_INCREMENT;not null;" json:"dishNameTagOption"`
+ DishNameTagOption int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOption;type:int;not null;" json:"dishNameTagOption"`
DE string `gorm:"column:DE;type:text;not null;" json:"DE"`
EN string `gorm:"column:EN;type:text;not null;" json:"EN"`
}
diff --git a/server/model/dishNameTagOptionExcluded.go b/server/model/dish_name_tag_option_excluded.go
similarity index 78%
rename from server/model/dishNameTagOptionExcluded.go
rename to server/model/dish_name_tag_option_excluded.go
index 7c8e6deb..f957ed11 100644
--- a/server/model/dishNameTagOptionExcluded.go
+++ b/server/model/dish_name_tag_option_excluded.go
@@ -1,8 +1,8 @@
package model
type DishNameTagOptionExcluded struct {
- DishNameTagOptionExcluded int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOptionExcluded;type:int;not null;" json:"dishNameTagOptionExcluded"`
- NameTagID int32 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
+ DishNameTagOptionExcluded int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOptionExcluded;type:int;not null;" json:"dishNameTagOptionExcluded"`
+ NameTagID int64 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
Expression string `gorm:"column:expression;type:text;" json:"expression"`
}
diff --git a/server/model/dishNameTagOptionIncluded.go b/server/model/dish_name_tag_option_included.go
similarity index 78%
rename from server/model/dishNameTagOptionIncluded.go
rename to server/model/dish_name_tag_option_included.go
index 8ed262f0..ddd7683d 100644
--- a/server/model/dishNameTagOptionIncluded.go
+++ b/server/model/dish_name_tag_option_included.go
@@ -1,8 +1,8 @@
package model
type DishNameTagOptionIncluded struct {
- DishNameTagOptionIncluded int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOptionIncluded;type:int;not null;" json:"dishNameTagOptionIncluded"`
- NameTagID int32 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
+ DishNameTagOptionIncluded int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishNameTagOptionIncluded;type:int;not null;" json:"dishNameTagOptionIncluded"`
+ NameTagID int64 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
Expression string `gorm:"column:expression;type:text;" json:"expression"`
}
diff --git a/server/model/dishRating.go b/server/model/dish_rating.go
similarity index 76%
rename from server/model/dishRating.go
rename to server/model/dish_rating.go
index e31086f0..7b8e7f93 100644
--- a/server/model/dishRating.go
+++ b/server/model/dish_rating.go
@@ -5,10 +5,10 @@ import (
)
type DishRating struct {
- DishRating int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishRating;type:int;not null;" json:"dishRating"`
+ DishRating int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishRating;type:int;not null;" json:"dishRating"`
Points int32 `gorm:"column:points;type:int;not null;" json:"points"`
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
- DishID int32 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
+ DishID int64 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
Comment string `gorm:"column:comment;type:text;" json:"comment"`
Timestamp time.Time `gorm:"column:timestamp;type:timestamp;not null;" json:"timestamp"`
Image string `gorm:"column:image;type:text;" json:"image"`
diff --git a/server/model/dishRatingAverage.go b/server/model/dish_rating_average.go
similarity index 52%
rename from server/model/dishRatingAverage.go
rename to server/model/dish_rating_average.go
index 61ed1374..2db0571c 100644
--- a/server/model/dishRatingAverage.go
+++ b/server/model/dish_rating_average.go
@@ -2,13 +2,13 @@ package model
// DishRatingAverage stores all precomputed values for the cafeteria ratings
type DishRatingAverage struct {
- DishRatingAverage int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingAverage;type:int;not null;" json:"dishRatingAverage" `
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
- DishID int32 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
- Average float32 `gorm:"column:average;type:float;not null;" json:"average" `
- Min int8 `gorm:"column:min;type:int;not null;" json:"min"`
- Max int8 `gorm:"column:max;type:int;not null;" json:"max"`
- Std float32 `gorm:"column:std;type:float;not null;" json:"std"`
+ DishRatingAverage int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingAverage;type:int;not null;" json:"dishRatingAverage" `
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
+ DishID int64 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
+ Average float64 `gorm:"column:average;type:float;not null;" json:"average" `
+ Min int32 `gorm:"column:min;type:int;not null;" json:"min"`
+ Max int32 `gorm:"column:max;type:int;not null;" json:"max"`
+ Std float64 `gorm:"column:std;type:float;not null;" json:"std"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/dishRatingTag.go b/server/model/dish_rating_tag.go
similarity index 69%
rename from server/model/dishRatingTag.go
rename to server/model/dish_rating_tag.go
index d5248c3c..de2bda74 100644
--- a/server/model/dishRatingTag.go
+++ b/server/model/dish_rating_tag.go
@@ -1,10 +1,10 @@
package model
type DishRatingTag struct {
- DishRatingTag int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingTag;type:int;not null;" json:"dishRatingTag"`
- CorrespondingRating int32 `gorm:"foreignKey:cafeteriaRating;column:parentRating;type:int;not null;" json:"parentRating"`
+ DishRatingTag int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingTag;type:int;not null;" json:"dishRatingTag"`
+ CorrespondingRating int64 `gorm:"foreignKey:cafeteriaRating;column:parentRating;type:int;not null;" json:"parentRating"`
Points int32 `gorm:"column:points;type:int;not null;" json:"points"`
- TagID int `gorm:"foreignKey:dishRatingTagOption;column:tagID;type:int;not null;" json:"tagID"`
+ TagID int64 `gorm:"foreignKey:dishRatingTagOption;column:tagID;type:int;not null;" json:"tagID"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/dishRatingTagAverage.go b/server/model/dish_rating_tag_average.go
similarity index 76%
rename from server/model/dishRatingTagAverage.go
rename to server/model/dish_rating_tag_average.go
index b7b1d0c7..b1535171 100644
--- a/server/model/dishRatingTagAverage.go
+++ b/server/model/dish_rating_tag_average.go
@@ -2,10 +2,10 @@ package model
// DishRatingTagAverage stores all precomputed values for the cafeteria ratings
type DishRatingTagAverage struct {
- DishRatingTagsAverage int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingTagsAverage;type:int;not null;" json:"dishRatingTagsAverage" `
- CafeteriaID int32 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
- TagID int32 `gorm:"column:tagID;foreignKey:tagID;type:int;not null;" json:"tagID"`
- DishID int32 `gorm:"column:dishID;foreignKey:dishID;type:int;not null;" json:"dishID"`
+ DishRatingTagsAverage int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingTagsAverage;type:int;not null;" json:"dishRatingTagsAverage" `
+ CafeteriaID int64 `gorm:"column:cafeteriaID;foreignKey:cafeteria;type:int;not null;" json:"cafeteriaID"`
+ TagID int64 `gorm:"column:tagID;foreignKey:tagID;type:int;not null;" json:"tagID"`
+ DishID int64 `gorm:"column:dishID;foreignKey:dishID;type:int;not null;" json:"dishID"`
Average float32 `gorm:"column:average;type:float;not null;" json:"average" `
Min int8 `gorm:"column:min;type:int;not null;" json:"min"`
Max int8 `gorm:"column:max;type:int;not null;" json:"max"`
diff --git a/server/model/dishRatingTagOption.go b/server/model/dish_rating_tag_option.go
similarity index 89%
rename from server/model/dishRatingTagOption.go
rename to server/model/dish_rating_tag_option.go
index c1aeb01a..c1cbece0 100644
--- a/server/model/dishRatingTagOption.go
+++ b/server/model/dish_rating_tag_option.go
@@ -2,7 +2,7 @@ package model
// DishRatingTagOption stores all available options for tags which can be used to quickly rate dishes
type DishRatingTagOption struct {
- DishRatingTagOption int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingTagOption;type:int;not null;" json:"dishRatingTagOption"`
+ DishRatingTagOption int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishRatingTagOption;type:int;not null;" json:"dishRatingTagOption"`
DE string `gorm:"column:DE;type:text;default:de;not null;" json:"DE"`
EN string `gorm:"column:EN;type:text;default:en;not null;" json:"EN"`
}
diff --git a/server/model/dishToDishNameTags.go b/server/model/dish_to_dish_name_tag.go
similarity index 64%
rename from server/model/dishToDishNameTags.go
rename to server/model/dish_to_dish_name_tag.go
index 4c40080b..279ff1c5 100644
--- a/server/model/dishToDishNameTags.go
+++ b/server/model/dish_to_dish_name_tag.go
@@ -1,9 +1,9 @@
package model
type DishToDishNameTag struct {
- DishToDishNameTag int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishToDishNameTag;type:int;not null;" json:"dishToDishNameTag"`
- DishID int32 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
- NameTagID int32 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
+ DishToDishNameTag int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishToDishNameTag;type:int;not null;" json:"dishToDishNameTag"`
+ DishID int64 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
+ NameTagID int64 `gorm:"foreignKey:dishNameTagOption;column:nameTagID;type:int;not null;" json:"nameTagID"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/dishesOfTheWeek.go b/server/model/dishes_of_the_week.go
similarity index 79%
rename from server/model/dishesOfTheWeek.go
rename to server/model/dishes_of_the_week.go
index 7aa72331..219c306d 100644
--- a/server/model/dishesOfTheWeek.go
+++ b/server/model/dishes_of_the_week.go
@@ -1,11 +1,11 @@
package model
type DishesOfTheWeek struct {
- DishesOfTheWeek int32 `gorm:"primary_key;AUTO_INCREMENT;column:dishesOfTheWeek;type:int;not null;" json:"dishesOfTheWeek"`
+ DishesOfTheWeek int64 `gorm:"primary_key;AUTO_INCREMENT;column:dishesOfTheWeek;type:int;not null;" json:"dishesOfTheWeek"`
Year int32 `gorm:"column:year;type:int;not null;" json:"year"`
Week int32 `gorm:"column:week;type:int;not null;" json:"week"`
Day int32 `gorm:"column:day;type:int;not null;" json:"day"`
- DishID int32 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
+ DishID int64 `gorm:"column:dishID;foreignKey:dish;type:int;not null;" json:"dishID"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/exam_result_published.go b/server/model/exam_result_published.go
new file mode 100644
index 00000000..5cd24ffe
--- /dev/null
+++ b/server/model/exam_result_published.go
@@ -0,0 +1,58 @@
+package model
+
+import (
+ "encoding/xml"
+ "time"
+)
+
+type campusApiBool bool
+
+func (p *campusApiBool) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+ var value string
+ if err := d.DecodeElement(&value, &start); err != nil {
+ return err
+ }
+ switch value {
+ case "J":
+ *p = true
+ default:
+ *p = false
+ }
+ return nil
+}
+
+type TUMAPIPublishedExamResults struct {
+ XMLName xml.Name `xml:"pruefungen"`
+ ExamResults []TUMAPIPublishedExamResult `xml:"pruefung"`
+}
+
+type TUMAPIPublishedExamResult struct {
+ XMLName xml.Name `xml:"pruefung"`
+ Date customDate `xml:"datum"`
+ ExamID string `xml:"pv_term_nr"`
+ LectureTitle string `xml:"lv_titel"`
+ LectureNumber string `xml:"lv_nummer"`
+ LectureSem string `xml:"lv_semester"`
+ LectureType string `xml:"lv_typ"`
+ Published campusApiBool `xml:"note_veroeffentlicht"`
+}
+
+func (examResult *TUMAPIPublishedExamResult) ToDBExamResult() *PublishedExamResult {
+ return &PublishedExamResult{
+ Date: examResult.Date.Time,
+ ExamID: examResult.ExamID,
+ LectureTitle: examResult.LectureTitle,
+ LectureType: examResult.LectureType,
+ LectureSem: examResult.LectureSem,
+ Published: bool(examResult.Published),
+ }
+}
+
+type PublishedExamResult struct {
+ Date time.Time `json:"date"`
+ ExamID string `gorm:"primary_key" json:"examId"`
+ LectureTitle string `json:"lectureTitle"`
+ LectureType string `json:"lectureType"`
+ LectureSem string `json:"lectureSem"`
+ Published bool `json:"published"`
+}
diff --git a/server/model/feedback.go b/server/model/feedback.go
new file mode 100644
index 00000000..bbc16d1b
--- /dev/null
+++ b/server/model/feedback.go
@@ -0,0 +1,25 @@
+package model
+
+import (
+ "github.com/guregu/null"
+)
+
+type Feedback struct {
+ Id int64 `gorm:"column:id;primary_key;AUTO_INCREMENT;type:int;not null;"`
+ ImageCount int32 `gorm:"column:image_count;type:int;not null;"`
+ EmailId null.String `gorm:"column:email_id;type:text;null"`
+ Recipient null.String `gorm:"column:receiver;type:text;null"`
+ ReplyTo null.String `gorm:"column:reply_to;type:text;null"`
+ Feedback null.String `gorm:"column:feedback;type:text;null"`
+ Latitude null.Float `gorm:"column:latitude;type:float;null;"`
+ Longitude null.Float `gorm:"column:longitude;type:float;null;"`
+ OsVersion null.String `gorm:"column:os_version;type:text;null;"`
+ AppVersion null.String `gorm:"column:app_version;type:text;null;"`
+ Processed bool `gorm:"column:processed;type:boolean;default:false;not null;"`
+ Timestamp null.Time `gorm:"column:timestamp;type:timestamp;default:CURRENT_TIMESTAMP;null;"`
+}
+
+// TableName sets the insert table name for this struct type
+func (n *Feedback) TableName() string {
+ return "feedback"
+}
diff --git a/server/model/file.go b/server/model/file.go
new file mode 100644
index 00000000..be246062
--- /dev/null
+++ b/server/model/file.go
@@ -0,0 +1,35 @@
+package model
+
+import (
+ "database/sql"
+ "fmt"
+ "time"
+
+ "github.com/gofrs/uuid/v5"
+ "github.com/guregu/null"
+)
+
+var (
+ _ = time.Second
+ _ = sql.LevelDefault
+ _ = null.Bool{}
+ _ = uuid.UUID{}
+)
+
+// File struct is a row record of the files table in the tca database
+type File struct {
+ File int64 `gorm:"primary_key;AUTO_INCREMENT;column:file;type:int;" json:"file"`
+ Name string `gorm:"column:name;type:text;size:16777215;" json:"name"`
+ Path string `gorm:"column:path;type:text;size:16777215;" json:"path"`
+ Downloads int32 `gorm:"column:downloads;type:int;default:0;" json:"downloads"`
+ URL null.String `gorm:"column:url;default:null;" json:"url"` // URL of the files source (if any)
+ Downloaded null.Bool `gorm:"column:downloaded;type:boolean;default:1;" json:"downloaded"` // true when file is ready to be served, false when still being downloaded
+}
+
+// FullExternalUrl is the full url of the file after being downloaded for external use
+func (f *File) FullExternalUrl() string {
+ if !f.Downloaded.Valid || !f.Downloaded.Bool {
+ return ""
+ }
+ return fmt.Sprintf("https://api.tum.app/files/%s%s", f.Path, f.Name)
+}
diff --git a/server/model/files.go b/server/model/files.go
deleted file mode 100644
index 01c64983..00000000
--- a/server/model/files.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package model
-
-import (
- "database/sql"
- "time"
-
- "github.com/gofrs/uuid/v5"
- "github.com/guregu/null"
-)
-
-var (
- _ = time.Second
- _ = sql.LevelDefault
- _ = null.Bool{}
- _ = uuid.UUID{}
-)
-
-// Files struct is a row record of the files table in the tca database
-type Files struct {
- File int32 `gorm:"primary_key;AUTO_INCREMENT;column:file;type:int;" json:"file"`
- Name string `gorm:"column:name;type:text;size:16777215;" json:"name"`
- Path string `gorm:"column:path;type:text;size:16777215;" json:"path"`
- Downloads int32 `gorm:"column:downloads;type:int;default:0;" json:"downloads"`
- URL sql.NullString `gorm:"column:url;default:null;" json:"url"` // URL of the files source (if any)
- Downloaded sql.NullBool `gorm:"column:downloaded;type:boolean;default:1;" json:"downloaded"` // true when file is ready to be served, false when still being downloaded
-}
-
-// TableName sets the insert table name for this struct type
-func (f *Files) TableName() string {
- return "files"
-}
diff --git a/server/model/iosDevice.go b/server/model/ios_device.go
similarity index 100%
rename from server/model/iosDevice.go
rename to server/model/ios_device.go
diff --git a/server/model/iosDeviceLastUpdated.go b/server/model/ios_device_last_updated.go
similarity index 73%
rename from server/model/iosDeviceLastUpdated.go
rename to server/model/ios_device_last_updated.go
index d06c185e..be79699c 100644
--- a/server/model/iosDeviceLastUpdated.go
+++ b/server/model/ios_device_last_updated.go
@@ -1,16 +1,17 @@
package model
import (
- "database/sql"
"fmt"
+
+ "github.com/guregu/null"
)
// IOSDeviceLastUpdated used as a result of a query that joins
// IOSDevice and IOSDeviceRequestLog tables.
type IOSDeviceLastUpdated struct {
- DeviceID string `json:"deviceId"`
- LastUpdated sql.NullTime `json:"lastUpdated"`
- PublicKey string `json:"publicKey"`
+ DeviceID string `json:"deviceId"`
+ LastUpdated null.Time `json:"lastUpdated"`
+ PublicKey string `json:"publicKey"`
}
func (device *IOSDeviceLastUpdated) String() string {
diff --git a/server/model/iosDeviceRequestLog.go b/server/model/ios_device_request_log.go
similarity index 100%
rename from server/model/iosDeviceRequestLog.go
rename to server/model/ios_device_request_log.go
diff --git a/server/model/iosDevicesActivityReset.go b/server/model/ios_devices_activity_reset.go
similarity index 100%
rename from server/model/iosDevicesActivityReset.go
rename to server/model/ios_devices_activity_reset.go
diff --git a/server/model/ios_grade.go b/server/model/ios_grade.go
index 1d38cbb1..48a3cc83 100644
--- a/server/model/ios_grade.go
+++ b/server/model/ios_grade.go
@@ -4,7 +4,7 @@ import (
"encoding/xml"
"time"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_crypto"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/crypto"
)
// IOSGrades is a wrapper for a list of grades => XML stuff
@@ -55,7 +55,7 @@ func (grade *IOSGrade) CompareToEncrypted(encryptedGrade *IOSEncryptedGrade) boo
// IOSEncryptedGrade is a grade that can be encrypted.
// Whether it is currently encrypted or not is indicated by the IsEncrypted field.
type IOSEncryptedGrade struct {
- ID uint `gorm:"primaryKey"`
+ ID int64 `gorm:"primaryKey"`
Device IOSDevice `gorm:"constraint:OnDelete:CASCADE"`
DeviceID string `gorm:"index;not null"`
LectureTitle string `gorm:"not null"`
@@ -64,12 +64,12 @@ type IOSEncryptedGrade struct {
}
func (e *IOSEncryptedGrade) Encrypt(key string) error {
- encryptedTitle, err := ios_crypto.SymmetricEncrypt(e.LectureTitle, key)
+ encryptedTitle, err := crypto.SymmetricEncrypt(e.LectureTitle, key)
if err != nil {
return err
}
- encryptedGrade, err := ios_crypto.SymmetricEncrypt(e.Grade, key)
+ encryptedGrade, err := crypto.SymmetricEncrypt(e.Grade, key)
if err != nil {
return err
}
@@ -82,12 +82,12 @@ func (e *IOSEncryptedGrade) Encrypt(key string) error {
}
func (e *IOSEncryptedGrade) Decrypt(key string) error {
- decryptedTitle, err := ios_crypto.SymmetricDecrypt(ios_crypto.EncryptedString(e.LectureTitle), key)
+ decryptedTitle, err := crypto.SymmetricDecrypt(crypto.EncryptedString(e.LectureTitle), key)
if err != nil {
return err
}
- decryptedGrade, err := ios_crypto.SymmetricDecrypt(ios_crypto.EncryptedString(e.Grade), key)
+ decryptedGrade, err := crypto.SymmetricDecrypt(crypto.EncryptedString(e.Grade), key)
if err != nil {
return err
}
diff --git a/server/model/iosRemoteNotification.go b/server/model/ios_remote_notification.go
similarity index 94%
rename from server/model/iosRemoteNotification.go
rename to server/model/ios_remote_notification.go
index 4c7464c9..ee174c50 100644
--- a/server/model/iosRemoteNotification.go
+++ b/server/model/ios_remote_notification.go
@@ -5,7 +5,7 @@ package model
import (
"encoding/json"
- "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/ios_crypto"
+ "github.com/TUM-Dev/Campus-Backend/server/backend/ios_notifications/crypto"
)
type IOSNotificationPayload struct {
@@ -122,7 +122,7 @@ func (np *IOSNotificationPayload) Encrypt(publicKey string) *IOSNotificationPayl
np.aps().MutableContent = 1
if alert.Title != "" {
- res, err := ios_crypto.AsymmetricEncrypt(alert.Title, publicKey)
+ res, err := crypto.AsymmetricEncrypt(alert.Title, publicKey)
if err != nil {
alert.Title = "You have a new notification"
@@ -132,7 +132,7 @@ func (np *IOSNotificationPayload) Encrypt(publicKey string) *IOSNotificationPayl
}
if alert.Body != "" {
- res, err := ios_crypto.AsymmetricEncrypt(alert.Body, publicKey)
+ res, err := crypto.AsymmetricEncrypt(alert.Body, publicKey)
if err != nil {
alert.Body = ""
@@ -142,7 +142,7 @@ func (np *IOSNotificationPayload) Encrypt(publicKey string) *IOSNotificationPayl
}
if alert.Subtitle != "" {
- res, err := ios_crypto.AsymmetricEncrypt(alert.Subtitle, publicKey)
+ res, err := crypto.AsymmetricEncrypt(alert.Subtitle, publicKey)
if err != nil {
alert.Subtitle = ""
diff --git a/server/model/iosScheduledUpdateLog.go b/server/model/ios_scheduled_update_log.go
similarity index 93%
rename from server/model/iosScheduledUpdateLog.go
rename to server/model/ios_scheduled_update_log.go
index 0399e303..8a3c495e 100644
--- a/server/model/iosScheduledUpdateLog.go
+++ b/server/model/ios_scheduled_update_log.go
@@ -12,7 +12,7 @@ const (
// IOSScheduledUpdateLog logs the last time a device was updated.
type IOSScheduledUpdateLog struct {
- ID uint32 `gorm:"primary_key;auto_increment;not_null" json:"id"`
+ ID int64 `gorm:"primary_key;auto_increment;not_null" json:"id"`
DeviceID string `gorm:"index:idx_scheduled_update_log_device,unique" json:"deviceId"`
Device IOSDevice `gorm:"constraint:OnDelete:CASCADE;" json:"device"`
Type string `gorm:"type:enum ('grades');" json:"type"`
diff --git a/server/model/iosSchedulingPriority.go b/server/model/ios_scheduling_priority.go
similarity index 83%
rename from server/model/iosSchedulingPriority.go
rename to server/model/ios_scheduling_priority.go
index ffbb3300..39bd9ab5 100644
--- a/server/model/iosSchedulingPriority.go
+++ b/server/model/ios_scheduling_priority.go
@@ -8,12 +8,12 @@ import (
// IOSSchedulingPriority stores some default priorities for the scheduling of
// grade updates.
type IOSSchedulingPriority struct {
- ID int `gorm:"primary_key;auto_increment;not_null" json:"id"`
- FromDay int `gorm:"not null" json:"from_day"`
- ToDay int `gorm:"not null" json:"to_day"`
- FromHour int `gorm:"not null" json:"from_hour"`
- ToHour int `gorm:"not null" json:"to_hour"`
- Priority int `gorm:"not null" json:"priority"`
+ ID int64 `gorm:"primary_key;auto_increment;not_null" json:"id"`
+ FromDay int `gorm:"not null" json:"from_day"`
+ ToDay int `gorm:"not null" json:"to_day"`
+ FromHour int `gorm:"not null" json:"from_hour"`
+ ToHour int `gorm:"not null" json:"to_hour"`
+ Priority int `gorm:"not null" json:"priority"`
}
// IsCurrentlyInRange returns true if the current time is in the range of the
diff --git a/server/model/kino.go b/server/model/kino.go
new file mode 100644
index 00000000..f8eec7a0
--- /dev/null
+++ b/server/model/kino.go
@@ -0,0 +1,31 @@
+package model
+
+import (
+ "time"
+
+ "github.com/guregu/null"
+)
+
+// Kino stores all movies
+type Kino struct {
+ Id int64 `gorm:"primary_key;AUTO_INCREMENT;column:kino;type:int;not null;"`
+ Date time.Time `gorm:"column:date;type:datetime;not null;"`
+ Created time.Time `gorm:"column:created;type:timestamp;not null;default:CURRENT_TIMESTAMP"`
+ Title string `gorm:"column:title;type:text;not null;"`
+ Year string `gorm:"column:year;type:varchar(4);not null;"`
+ Runtime string `gorm:"column:runtime;type:varchar(40);not null;"`
+ Genre string `gorm:"column:genre;type:varchar(100);not null;"`
+ Director string `gorm:"column:director;type:text;not null;"`
+ Actors string `gorm:"column:actors;type:text;not null;"`
+ ImdbRating string `gorm:"column:rating;type:varchar(4);not null;"`
+ Description string `gorm:"column:description;type:text;not null;"`
+ Trailer null.String `gorm:"column:trailer"`
+ FileID int64 `gorm:"column:cover"`
+ File File `gorm:"foreignKey:FileID;references:file"`
+ Link string `gorm:"column:link;type:varchar(190);not null;unique;"`
+}
+
+// TableName sets the insert table name for this struct type
+func (n *Kino) TableName() string {
+ return "kino"
+}
diff --git a/server/model/new_exam_results_subscriber.go b/server/model/new_exam_results_subscriber.go
new file mode 100644
index 00000000..56bb5661
--- /dev/null
+++ b/server/model/new_exam_results_subscriber.go
@@ -0,0 +1,14 @@
+package model
+
+import (
+ "time"
+
+ "github.com/guregu/null"
+)
+
+type NewExamResultsSubscriber struct {
+ CallbackUrl string `gorm:"primary_key" json:"callbackUrl"`
+ ApiKey null.String `json:"-"`
+ CreatedAt time.Time `gorm:"autoCreateTime" json:"createdAt"`
+ LastNotifiedAt null.Time `json:"lastNotifiedAt"`
+}
diff --git a/server/model/news.go b/server/model/news.go
index 04c32c5f..5de7ace7 100755
--- a/server/model/news.go
+++ b/server/model/news.go
@@ -15,15 +15,17 @@ var (
// News struct is a row record of the news table in the tca database
type News struct {
- News int32 `gorm:"primary_key;AUTO_INCREMENT;column:news;type:int;" json:"news"`
- Date time.Time `gorm:"column:date;type:datetime;" json:"date"`
- Created time.Time `gorm:"column:created;type:timestamp;default:CURRENT_TIMESTAMP;" json:"created"`
- Title string `gorm:"column:title;type:text;size:255;" json:"title"`
- Description string `gorm:"column:description;type:text;size:65535;" json:"description"`
- Src int32 `gorm:"column:src;type:int;" json:"src"`
- Link string `gorm:"column:link;type:varchar(190);" json:"link"`
- Image null.String `gorm:"column:image;type:text;size:65535;" json:"image"`
- File null.Int `gorm:"column:file;type:int;" json:"file"`
+ News int64 `gorm:"primary_key;AUTO_INCREMENT;column:news;type:int;"`
+ Date time.Time `gorm:"column:date;type:datetime;"`
+ Created time.Time `gorm:"column:created;type:timestamp;default:CURRENT_TIMESTAMP;"`
+ Title string `gorm:"column:title;type:text;size:255;"`
+ Description string `gorm:"column:description;type:text;size:65535;"`
+ NewsSourceID int64 `gorm:"column:src;type:int;"`
+ NewsSource NewsSource `gorm:"foreignKey:NewsSourceID;references:source;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
+ Link string `gorm:"column:link;type:varchar(190);"`
+ Image null.String `gorm:"column:image;type:text;size:65535;"`
+ FileID null.Int `gorm:"column:file;type:int;"`
+ File *File `gorm:"foreignKey:FileID;references:file;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/news_alert.go b/server/model/news_alert.go
index 0956940a..076c1ae1 100644
--- a/server/model/news_alert.go
+++ b/server/model/news_alert.go
@@ -17,9 +17,9 @@ var (
// NewsAlert struct is a row record of the news_alert table in the tca database
type NewsAlert struct {
- NewsAlert int32 `gorm:"primary_key;AUTO_INCREMENT;column:news_alert;type:int;" json:"news_alert"`
- FilesID int32 `gorm:"column:file;not null"`
- Files Files `gorm:"foreignKey:FilesID;references:file;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
+ NewsAlert int64 `gorm:"primary_key;AUTO_INCREMENT;column:news_alert;type:int;" json:"news_alert"`
+ FileID int64 `gorm:"column:file;not null"`
+ File File `gorm:"foreignKey:FileID;references:file;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
Name null.String `gorm:"column:name;type:varchar(100);" json:"name"`
Link null.String `gorm:"column:link;type:text;size:65535;" json:"link"`
Created time.Time `gorm:"column:created;type:timestamp;default:CURRENT_TIMESTAMP;" json:"created"`
diff --git a/server/model/news_source.go b/server/model/news_source.go
index 69b91cfe..62cc4ca2 100644
--- a/server/model/news_source.go
+++ b/server/model/news_source.go
@@ -17,12 +17,12 @@ var (
// NewsSource struct is a row record of the newsSource table in the tca database
type NewsSource struct {
- Source int32 `gorm:"primary_key;AUTO_INCREMENT;column:source;type:int;"`
- Title string `gorm:"column:title;type:text;size:16777215;"`
- URL null.String `gorm:"column:url;type:text;size:16777215;"`
- FilesID int32 `gorm:"column:icon;not null"`
- Files Files `gorm:"foreignKey:FilesID;references:file;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
- Hook null.String `gorm:"column:hook;type:char;size:12;"`
+ Source int64 `gorm:"primary_key;AUTO_INCREMENT;column:source;type:int;"`
+ Title string `gorm:"column:title;type:text;size:16777215;"`
+ URL null.String `gorm:"column:url;type:text;size:16777215;"`
+ FileID int64 `gorm:"column:icon;not null;type:int;"`
+ File File `gorm:"foreignKey:FileID;references:file;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
+ Hook null.String `gorm:"column:hook;type:char;size:12;"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/notification.go b/server/model/notification.go
index c6ada430..8c93943d 100644
--- a/server/model/notification.go
+++ b/server/model/notification.go
@@ -17,7 +17,7 @@ var (
// Notification struct is a row record of the notification table in the tca database
type Notification struct {
- Notification int32 `gorm:"primary_key;AUTO_INCREMENT;column:notification;type:int;" json:"notification"`
+ Notification int64 `gorm:"primary_key;AUTO_INCREMENT;column:notification;type:int;" json:"notification"`
Type int32 `gorm:"column:type;type:int;" json:"type"`
Location null.Int `gorm:"column:location;type:int;" json:"location"`
Title string `gorm:"column:title;type:text;size:65535;" json:"title"`
diff --git a/server/model/notification_confirmation.go b/server/model/notification_confirmation.go
index 51b7e88d..f5b6a39c 100644
--- a/server/model/notification_confirmation.go
+++ b/server/model/notification_confirmation.go
@@ -17,8 +17,8 @@ var (
// NotificationConfirmation struct is a row record of the notification_confirmation table in the tca database
type NotificationConfirmation struct {
- Notification int32 `gorm:"primary_key;column:notification;type:int;" json:"notification"`
- Device int32 `gorm:"primary_key;column:device;type:int;" json:"device"`
+ Notification int64 `gorm:"primary_key;column:notification;type:int;" json:"notification"`
+ Device int64 `gorm:"primary_key;column:device;type:int;" json:"device"`
Sent int32 `gorm:"column:sent;type:tinyint;default:0;" json:"sent"`
Created time.Time `gorm:"column:created;type:timestamp;default:CURRENT_TIMESTAMP;" json:"created"`
Received null.Time `gorm:"column:received;type:timestamp;" json:"received"`
diff --git a/server/model/notification_type.go b/server/model/notification_type.go
index 3b2ae0c7..661383d7 100644
--- a/server/model/notification_type.go
+++ b/server/model/notification_type.go
@@ -17,7 +17,7 @@ var (
// NotificationType struct is a row record of the notification_type table in the tca database
type NotificationType struct {
- Type int32 `gorm:"primary_key;AUTO_INCREMENT;column:type;type:int;" json:"type"`
+ Type int64 `gorm:"primary_key;AUTO_INCREMENT;column:type;type:int;" json:"type"`
Name string `gorm:"column:name;type:text;size:65535;" json:"name"`
Confirmation string `gorm:"column:confirmation;type:char;size:5;default:false;" json:"confirmation"`
}
diff --git a/server/model/roomfinder_building2area.go b/server/model/roomfinder_building2area.go
index b8babe58..4f72cda4 100644
--- a/server/model/roomfinder_building2area.go
+++ b/server/model/roomfinder_building2area.go
@@ -17,8 +17,8 @@ var (
// RoomfinderBuilding2area struct is a row record of the roomfinder_building2area table in the tca database
type RoomfinderBuilding2area struct {
- AreaID int32 `gorm:"column:area_id;type:int;" json:"area_id"`
BuildingNr string `gorm:"primary_key;column:building_nr;type:varchar(8);" json:"building_nr"`
+ AreaID int32 `gorm:"column:area_id;type:int;" json:"area_id"`
Campus string `gorm:"column:campus;type:char;size:1;" json:"campus"`
Name string `gorm:"column:name;type:varchar(32);" json:"name"`
}
diff --git a/server/model/roomfinder_buildings2maps.go b/server/model/roomfinder_buildings2maps.go
index 6559cf03..50b3cecf 100644
--- a/server/model/roomfinder_buildings2maps.go
+++ b/server/model/roomfinder_buildings2maps.go
@@ -18,7 +18,7 @@ var (
// RoomfinderBuildings2maps struct is a row record of the roomfinder_buildings2maps table in the tca database
type RoomfinderBuildings2maps struct {
BuildingNr string `gorm:"primary_key;column:building_nr;type:varchar(8);" json:"building_nr"`
- MapID int32 `gorm:"primary_key;column:map_id;type:int;" json:"map_id"`
+ MapID int64 `gorm:"primary_key;column:map_id;type:int;" json:"map_id"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/roomfinder_maps.go b/server/model/roomfinder_maps.go
index a1f2fae7..e34f6a55 100644
--- a/server/model/roomfinder_maps.go
+++ b/server/model/roomfinder_maps.go
@@ -17,7 +17,7 @@ var (
// RoomfinderMaps struct is a row record of the roomfinder_maps table in the tca database
type RoomfinderMaps struct {
- MapID int32 `gorm:"primary_key;column:map_id;type:int;" json:"map_id"`
+ MapID int64 `gorm:"primary_key;column:map_id;type:int;" json:"map_id"`
Description string `gorm:"column:description;type:varchar(64);" json:"description"`
Scale int32 `gorm:"column:scale;type:int;" json:"scale"`
Width int32 `gorm:"column:width;type:int;" json:"width"`
diff --git a/server/model/roomfinder_rooms.go b/server/model/roomfinder_rooms.go
index e7fb8c2e..3b81d041 100644
--- a/server/model/roomfinder_rooms.go
+++ b/server/model/roomfinder_rooms.go
@@ -17,7 +17,7 @@ var (
// RoomfinderRooms struct is a row record of the roomfinder_rooms table in the tca database
type RoomfinderRooms struct {
- RoomID int32 `gorm:"primary_key;column:room_id;type:int;" json:"room_id"`
+ RoomID int64 `gorm:"primary_key;column:room_id;type:int;" json:"room_id"`
RoomCode null.String `gorm:"column:room_code;type:varchar(32);" json:"room_code"`
BuildingNr null.String `gorm:"column:building_nr;type:varchar(8);" json:"building_nr"`
ArchID null.String `gorm:"column:arch_id;type:varchar(16);" json:"arch_id"`
diff --git a/server/model/roomfinder_rooms2maps.go b/server/model/roomfinder_rooms2maps.go
index 1af8d278..a7c7bafc 100644
--- a/server/model/roomfinder_rooms2maps.go
+++ b/server/model/roomfinder_rooms2maps.go
@@ -17,8 +17,8 @@ var (
// RoomfinderRooms2maps struct is a row record of the roomfinder_rooms2maps table in the tca database
type RoomfinderRooms2maps struct {
- RoomID int32 `gorm:"primary_key;column:room_id;type:int;" json:"room_id"`
- MapID int32 `gorm:"primary_key;column:map_id;type:int;" json:"map_id"`
+ RoomID int64 `gorm:"primary_key;column:room_id;type:int;" json:"room_id"`
+ MapID int64 `gorm:"primary_key;column:map_id;type:int;" json:"map_id"`
}
// TableName sets the insert table name for this struct type
diff --git a/server/model/updateNote.go b/server/model/update_note.go
similarity index 84%
rename from server/model/updateNote.go
rename to server/model/update_note.go
index 15ec9c7d..ad83708f 100755
--- a/server/model/updateNote.go
+++ b/server/model/update_note.go
@@ -2,7 +2,7 @@ package model
// UpdateNote struct for update notes
type UpdateNote struct {
- VersionCode int32 `gorm:"primary_key;AUTO_INCREMENT;column:version_code;type:int;"`
+ VersionCode int64 `gorm:"primary_key;AUTO_INCREMENT;column:version_code;type:int;"`
VersionName string `gorm:"column:version_name;type:text;"`
Message string `gorm:"column:message;type:text;"`
}
+
+Vorstellung
+ +6. April: Babylon (Garching, OV)
+
+
+
+
+Babylon (Digital)+USA (2022)+ |
+|
+ +Zum Trailer + 
+
+
+Regie: Damien Chazelle + Schauspieler: Brad Pitt, Margot Robbie, Jean Smart + 189 Minuten + |
+
+
+
+
+Its the 1920s, California, a chaotic world of parties and movie sets, crime and exuberance. Newcomers Nellie LaRoy (Margot Robbie) and Manny Torres (Diego Calva) will do everything to find their success. In front of the camera or behind it. When movies
+ + +Dont let that story stop you tough, these three hours are filled with dance and drugs, music and montages, porn and poetry. You might not need that much of an attention span and you might not want it. + +In the end, there is one thing Hollywood does best: Make movies about themselves. Did they forget to mention that these movies were made for nazi germany? Is all this crime and perversion really ok because the movies are just that good? Don't think about it too much, you will still enjoy it. +Chazelle’s film commemorates the era’s hubris as it indulges in a bit of its own. This is how a world ends. Not with a whimper but a great deal of banging, baby. And vomiting. And snorting. (Irish Times)
+ |
+
start getting lounder and sets get quiet, they and movie stars of old like Jack Conrad (Brad Pitt) will have to adapt or face extinction.
