fixed naming issues for the db models

server/backend/cron/average_rating_computation.go

@@ -59,7 +59,7 @@ func computeAverageForDishesInCafeteriasTags(c *CronService) {
 }
 
 func computeAverageCafeteriaTags(c *CronService) {
-	var results []model.CafeteriaRatingTagsAverage
+	var results []model.CafeteriaRatingTagAverage
 	err := c.db.Raw("SELECT cr.cafeteriaID as cafeteriaID, crt.tagID as tagID, AVG(crt.points) as average, MAX(crt.points) as max, MIN(crt.points) as min, STD(crt.points) as std" +
 		" FROM cafeteria_rating cr" +
 		" JOIN cafeteria_rating_tag crt ON cr.cafeteriaRating = crt.correspondingRating" +
@@ -68,7 +68,7 @@ func computeAverageCafeteriaTags(c *CronService) {
 	if err != nil {
 		log.WithError(err).Error("while precomputing average cafeteria tags.")
 	} else if len(results) > 0 {
-		if err := c.db.Where("1=1").Delete(&model.CafeteriaRatingTagsAverage{}).Error; err != nil {
+		if err := c.db.Where("1=1").Delete(&model.CafeteriaRatingTagAverage{}).Error; err != nil {
 			log.WithError(err).Error("Error while deleting old averages in the table.")
 		}
 

server/backend/device.go

@@ -19,13 +19,13 @@ 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
+	devices map[string]*model.Device // key is uuid
 }
 
 func newDeviceBuffer() *deviceBuffer {
 	return &deviceBuffer{
 		lock:    sync.Mutex{},
-		devices: make(map[string]*model.Devices),
+		devices: make(map[string]*model.Device),
 	}
 }
 
@@ -47,7 +47,7 @@ func (b *deviceBuffer) add(deviceID string, method string, osVersion string, app
 	if _, exists := b.devices[deviceID]; exists {
 		b.devices[deviceID].Counter++
 	} else {
-		b.devices[deviceID] = &model.Devices{
+		b.devices[deviceID] = &model.Device{
 			UUID:       deviceID,
 			LastAccess: time.Now(),
 			LastAPI:    method,
@@ -62,7 +62,7 @@ func (b *deviceBuffer) add(deviceID string, method string, osVersion string, app
 func (b *deviceBuffer) flush(tx *gorm.DB) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
-	devices := make([]*model.Devices, 0, len(b.devices))
+	devices := make([]*model.Device, 0, len(b.devices))
 	for _, device := range b.devices {
 		devices = append(devices, device)
 	}
@@ -86,7 +86,7 @@ func (b *deviceBuffer) flush(tx *gorm.DB) error {
 	if err != nil {
 		log.WithError(err).Error("failed to flush device buffer")
 	}
-	b.devices = make(map[string]*model.Devices)
+	b.devices = make(map[string]*model.Device)
 	return nil
 }
 

server/backend/migration/20220713000000.go

@@ -18,7 +18,7 @@ func (m TumDBMigrator) migrate20220713000000() *gormigrate.Migration {
 				&model.CafeteriaRating{},
 				&model.CafeteriaRatingAverage{},
 				&model.CafeteriaRatingTag{},
-				&model.CafeteriaRatingTagsAverage{},
+				&model.CafeteriaRatingTagAverage{},
 				&model.CafeteriaRatingTagOption{},
 				&model.Dish{},
 				&model.DishesOfTheWeek{},

server/model/cafeteria_rating_tag_average.go

@@ -1,7 +1,7 @@
 package model
 
-// CafeteriaRatingTagsAverage stores all precomputed values for the cafeteria ratings
-type CafeteriaRatingTagsAverage struct {
+// CafeteriaRatingTagAverage stores all precomputed values for the cafeteria ratings
+type CafeteriaRatingTagAverage struct {
 	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"`
@@ -12,6 +12,6 @@ type CafeteriaRatingTagsAverage struct {
 }
 
 // TableName sets the insert table name for this struct type
-func (n *CafeteriaRatingTagsAverage) TableName() string {
+func (n *CafeteriaRatingTagAverage) TableName() string {
 	return "cafeteria_rating_tag_average"
 }

server/model/devices.go → server/model/device.go

@@ -6,8 +6,8 @@ import (
 	"github.com/guregu/null"
 )
 
-// Devices struct is a row record of the devices table in the tca database
-type Devices struct {
+// Device struct is a row record of the devices table in the tca database
+type Device struct {
 	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"`

server/model/ios_device_request_log.go

@@ -13,8 +13,8 @@ import "time"
 // containing the RequestID and the data.
 type IOSDeviceRequestLog struct {
 	RequestID   string    `gorm:"primary_key;default:UUID()" json:"requestId"`
-	DeviceID    string    `json:"deviceId" gorm:"size:200;not null"`
-	Device      IOSDevice `json:"device" gorm:"constraint:OnDelete:CASCADE;"`
-	RequestType string    `json:"requestType" gorm:"not null;type:enum ('CAMPUS_TOKEN_REQUEST');"`
+	DeviceID    string    `gorm:"size:200;not null" json:"deviceId"`
+	Device      IOSDevice `gorm:"constraint:OnDelete:CASCADE;" json:"device"`
+	RequestType string    `gorm:"not null;type:enum ('CAMPUS_TOKEN_REQUEST');" json:"requestType"`
 	CreatedAt   time.Time `gorm:"autoCreateTime" json:"createdAt"`
 }