From 6900a7fe2e03ad777bf40fc28baf63f2c383a2ae Mon Sep 17 00:00:00 2001 From: Paweł Bernaciak Date: Sun, 22 Oct 2023 16:37:48 +0200 Subject: More model fixes --- backend/Elements.Data/Models/Suggestion.cs | 9 ++++++--- backend/Elements.Data/Models/User.cs | 6 ++++-- backend/Elements.Data/Models/Vote.cs | 8 ++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 backend/Elements.Data/Models/Vote.cs (limited to 'backend/Elements.Data/Models') diff --git a/backend/Elements.Data/Models/Suggestion.cs b/backend/Elements.Data/Models/Suggestion.cs index 3d626fc..bd936a4 100644 --- a/backend/Elements.Data/Models/Suggestion.cs +++ b/backend/Elements.Data/Models/Suggestion.cs @@ -5,9 +5,12 @@ public class Suggestion public int Id { get; set; } public required string Name { get; init; } public required byte[] Icon { get; init; } - public required Element FirstIngredient { get; init; } - public required Element SecondIngredient { get; init; } + public required int FirstElementId { get; init; } + public required int SecondElementId { get; init; } public required DateTime VotingEnd { get; init; } - public required int Votes { get; set; } = 1; public required int UserId { get; init; } + + public Element FirstElement { get; set; } = null!; + public Element SecondElement { get; set; } = null!; + public ICollection Votes { get; } = new List(); } \ No newline at end of file diff --git a/backend/Elements.Data/Models/User.cs b/backend/Elements.Data/Models/User.cs index 63be88a..bf3231b 100644 --- a/backend/Elements.Data/Models/User.cs +++ b/backend/Elements.Data/Models/User.cs @@ -5,6 +5,8 @@ public class User public int Id { get; set; } public required string GoogleId { get; init; } public required string Name { get; set; } - public required ICollection Elements { get; set; } - public required ICollection Suggestions { get; set; } + + public ICollection Elements { get; } = new List(); + public ICollection Suggestions { get; } = new List(); + public ICollection Votes { get; } = new List(); } \ No newline at end of file diff --git a/backend/Elements.Data/Models/Vote.cs b/backend/Elements.Data/Models/Vote.cs new file mode 100644 index 0000000..2979692 --- /dev/null +++ b/backend/Elements.Data/Models/Vote.cs @@ -0,0 +1,8 @@ +namespace Elements.Data.Models; + +public class Vote +{ + public int Id { get; set; } + public required int UserId { get; init; } + public required int SuggestionId { get; set; } +} \ No newline at end of file -- cgit v1.2.3