From 0be95e2d54c464a7814db0dbc7a06ab317ba2995 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Fri, 23 Aug 2024 16:06:56 +0200 Subject: [PATCH] tested a different implementation of canteen rating tags --- server/backend/migration/20220713000000.go | 14 +++++++------- server/model/canteen_rating_tag.go | 12 +++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/server/backend/migration/20220713000000.go b/server/backend/migration/20220713000000.go index 1f1d4223..653eec06 100644 --- a/server/backend/migration/20220713000000.go +++ b/server/backend/migration/20220713000000.go @@ -39,10 +39,10 @@ func (n *InitialCafeteriaRating) TableName() string { // InitialCafeteriaRatingTag struct is a row record of the either the dish_tag_rating-table or the cafeteria_rating_tags-table in the database type InitialCafeteriaRatingTag struct { - 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 int64 `gorm:"foreignKey:cafeteriaRatingTagOption;column:tagID;type:int;not null;" json:"tagID"` + CafeteriaRatingTag int64 `gorm:"primary_key;AUTO_INCREMENT;column:CafeteriaRatingTag;type:int;not null;"` + CorrespondingRating int64 `gorm:"foreignKey:cafeteriaRatingID;column:correspondingRating;type:int;not null;"` + Points int32 `gorm:"column:points;type:int;not null;"` + TagID int64 `gorm:"foreignKey:cafeteriaRatingTagOption;column:tagID;type:int;not null;"` } // TableName sets the insert table name for this struct type @@ -52,9 +52,9 @@ func (n *InitialCafeteriaRatingTag) TableName() string { // InitialCafeteriaRatingTagOption stores all available options for tags which can be used to quickly rate cafeterias type InitialCafeteriaRatingTagOption 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"` + CafeteriaRatingsTagOption int64 `gorm:"primary_key;AUTO_INCREMENT;column:cafeteriaRatingTagOption;type:int;not null;"` + DE string `gorm:"column:DE;text;default:('de');not null;"` + EN string `gorm:"column:EN;text;default:('en');not null;"` } // TableName sets the insert table name for this struct type diff --git a/server/model/canteen_rating_tag.go b/server/model/canteen_rating_tag.go index 225fe195..cac80330 100644 --- a/server/model/canteen_rating_tag.go +++ b/server/model/canteen_rating_tag.go @@ -1,9 +1,11 @@ package model -// CanteenRatingTag struct is a row record of the either the dish_tag_ratings-table or the cafeteria_rating_tags-table in the database +// CanteenRatingTag connects Canteens with ratings type CanteenRatingTag struct { - CafeteriaRatingTag int64 `gorm:"primary_key;AUTO_INCREMENT;column:CanteenRatingTag;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 int64 `gorm:"foreignKey:cafeteriaRatingTagOption;column:tagID;type:int;not null;" json:"tagID"` + CanteenRatingTag int64 `gorm:"primary_key;AUTO_INCREMENT;column:CafeteriaRatingTag"` + CorrespondingRatingID int64 + CorrespondingRating CanteenRating + TagID int64 + Tag CanteenRatingTagOption + Points int32 }