diff --git a/FoodsharingSiegen.Contracts/Entity/Audit.cs b/FoodsharingSiegen.Contracts/Entity/Audit.cs index 0e6d3e5..ebd334a 100644 --- a/FoodsharingSiegen.Contracts/Entity/Audit.cs +++ b/FoodsharingSiegen.Contracts/Entity/Audit.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using FoodsharingSiegen.Contracts.Enums; namespace FoodsharingSiegen.Contracts.Entity { diff --git a/FoodsharingSiegen.Contracts/Entity/Enums.cs b/FoodsharingSiegen.Contracts/Entity/Enums.cs deleted file mode 100644 index 2f1da89..0000000 --- a/FoodsharingSiegen.Contracts/Entity/Enums.cs +++ /dev/null @@ -1,221 +0,0 @@ -using FoodsharingSiegen.Contracts.Model; - -namespace FoodsharingSiegen.Contracts.Entity -{ - /// - /// The audit type enum - /// - public enum AuditType - { - /// - /// The none audit type - /// - None = 0, - - // Profile - /// - /// The save profile audit type - /// - SaveProfile = 10, - - - #region Usermanagement - - /// - /// The create user audit type - /// - CreateUser = 30, - - /// - /// The update user audit type - /// - UpdateUser = 40, - - /// - /// The remove user audit type - /// - RemoveUser = 50, - - /// - /// The set user password audit type - /// - SetUserPassword = 60, - - #endregion Usermanagement - - #region Prospects - - // Prospect - /// - /// The create prospect audit type - /// - CreateProspect = 70, - - /// - /// The edit prospect audit type - /// - EditProspect = 80, - - /// - /// The add interaction audit type - /// - AddInteraction = 90, - - /// - /// The remove interaction audit type - /// - RemoveInteraction = 100 - - #endregion Prospects - } - - /// - /// The user type enum - /// - public enum UserType - { - /// - /// The unverified user type - /// - Unverified = 100, - - /// - /// The user user type - /// - User = 200, - - /// - /// The admin user type - /// - Admin = 300 - } - - public enum ProspectStateFilter - { - All = 0, - - OnBoarding = 10, - - Verification = 20, - - Completed = 30 - } - - /// - /// The user group enum - /// - public enum UserGroup - { - /// - /// The read only user group - /// - ReadOnly = 100, - - /// - /// The welcome team user group - /// - WelcomeTeam = 200, - - /// - /// The store manager user group - /// - StoreManager = 300, - - /// - /// The ambassador user group - /// - Ambassador = 400 - } - - /// - /// Represents the state of a record within the system. - /// - public enum RecordState - { - Default = 10, - - Deleted = 20 - } - - /// - /// The fs network type enum - /// - public enum FsNetworkType - { - /// - /// The germany fs network type - /// - [CustomValue("https://foodsharing.de")] - Germany = 0, - - /// - /// The germany beta fs network type - /// - [CustomValue("https://beta.foodsharing.de")] - GermanyBeta = 10, - - /// - /// The austria fs network type - /// - [CustomValue("https://foodsharing.at")] - Austria = 20, - - /// - /// The austria beta fs network type - /// - [CustomValue("https://beta.foodsharing.at")] - AustriaBeta = 30, - - /// - /// The switzerland fs network type - /// - [CustomValue("https://foodsharing.network")] - Switzerland = 40 - } - - /// - /// The interaction type enum - /// - public enum InteractionType - { - /// - /// The ein ab interaction type - /// - EinAb = 10, - - /// - /// The welcome interaction type - /// - Welcome = 20, - - /// - /// The id check interaction type - /// - IdCheck = 30, - - /// - /// The print pass interaction type - /// - PrintPass = 40, - - /// - /// The verify interaction type - /// - Verify = 60, - - /// - /// The complete interaction type - /// - Complete = 70, - - /// - /// The StepInBriefing interaction type - /// - StepInBriefing = 80, - - /// - /// The StepInBriefing interaction type - /// - ReleasedForVerification = 90 - } -} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Entity/Interaction.cs b/FoodsharingSiegen.Contracts/Entity/Interaction.cs index 2608f7d..50f0ac1 100644 --- a/FoodsharingSiegen.Contracts/Entity/Interaction.cs +++ b/FoodsharingSiegen.Contracts/Entity/Interaction.cs @@ -6,6 +6,7 @@ using System.Data; using System.Data.Common; using System.Linq; using System.Linq.Expressions; +using FoodsharingSiegen.Contracts.Enums; namespace FoodsharingSiegen.Contracts.Entity { @@ -40,7 +41,7 @@ namespace FoodsharingSiegen.Contracts.Entity /// /// Gets or sets the value of the info (ab) /// - public string? Info { get; set; } + public string? Info1 { get; set; } /// /// Gets or sets the value of the not needed (ab) diff --git a/FoodsharingSiegen.Contracts/Entity/Prospect.cs b/FoodsharingSiegen.Contracts/Entity/Prospect.cs index 2485022..bbb4894 100644 --- a/FoodsharingSiegen.Contracts/Entity/Prospect.cs +++ b/FoodsharingSiegen.Contracts/Entity/Prospect.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using FoodsharingSiegen.Contracts.Enums; namespace FoodsharingSiegen.Contracts.Entity { diff --git a/FoodsharingSiegen.Contracts/Entity/User.cs b/FoodsharingSiegen.Contracts/Entity/User.cs index 22633e0..2424cca 100644 --- a/FoodsharingSiegen.Contracts/Entity/User.cs +++ b/FoodsharingSiegen.Contracts/Entity/User.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Helper; namespace FoodsharingSiegen.Contracts.Entity diff --git a/FoodsharingSiegen.Contracts/Enums/AuditType.cs b/FoodsharingSiegen.Contracts/Enums/AuditType.cs new file mode 100644 index 0000000..f0a0b77 --- /dev/null +++ b/FoodsharingSiegen.Contracts/Enums/AuditType.cs @@ -0,0 +1,69 @@ +namespace FoodsharingSiegen.Contracts.Enums +{ + /// + /// The audit type enum + /// + public enum AuditType + { + /// + /// The none audit type + /// + None = 0, + + // Profile + /// + /// The save profile audit type + /// + SaveProfile = 10, + + + #region Usermanagement + + /// + /// The create user audit type + /// + CreateUser = 30, + + /// + /// The update user audit type + /// + UpdateUser = 40, + + /// + /// The remove user audit type + /// + RemoveUser = 50, + + /// + /// The set user password audit type + /// + SetUserPassword = 60, + + #endregion Usermanagement + + #region Prospects + + // Prospect + /// + /// The create prospect audit type + /// + CreateProspect = 70, + + /// + /// The edit prospect audit type + /// + EditProspect = 80, + + /// + /// The add interaction audit type + /// + AddInteraction = 90, + + /// + /// The remove interaction audit type + /// + RemoveInteraction = 100 + + #endregion Prospects + } +} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Enums/FsNetworkType.cs b/FoodsharingSiegen.Contracts/Enums/FsNetworkType.cs new file mode 100644 index 0000000..3b6df8c --- /dev/null +++ b/FoodsharingSiegen.Contracts/Enums/FsNetworkType.cs @@ -0,0 +1,40 @@ +using FoodsharingSiegen.Contracts.Model; + +namespace FoodsharingSiegen.Contracts.Enums +{ + /// + /// The fs network type enum + /// + public enum FsNetworkType + { + /// + /// The germany fs network type + /// + [CustomValue("https://foodsharing.de")] + Germany = 0, + + /// + /// The germany beta fs network type + /// + [CustomValue("https://beta.foodsharing.de")] + GermanyBeta = 10, + + /// + /// The austria fs network type + /// + [CustomValue("https://foodsharing.at")] + Austria = 20, + + /// + /// The austria beta fs network type + /// + [CustomValue("https://beta.foodsharing.at")] + AustriaBeta = 30, + + /// + /// The switzerland fs network type + /// + [CustomValue("https://foodsharing.network")] + Switzerland = 40 + } +} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Enums/InteractionType.cs b/FoodsharingSiegen.Contracts/Enums/InteractionType.cs new file mode 100644 index 0000000..d6de932 --- /dev/null +++ b/FoodsharingSiegen.Contracts/Enums/InteractionType.cs @@ -0,0 +1,48 @@ +namespace FoodsharingSiegen.Contracts.Enums +{ + /// + /// The interaction type enum + /// + public enum InteractionType + { + /// + /// The ein ab interaction type + /// + EinAb = 10, + + /// + /// The welcome interaction type + /// + Welcome = 20, + + /// + /// The id check interaction type + /// + IdCheck = 30, + + /// + /// The print pass interaction type + /// + PrintPass = 40, + + /// + /// The verify interaction type + /// + Verify = 60, + + /// + /// The complete interaction type + /// + Complete = 70, + + /// + /// The StepInBriefing interaction type + /// + StepInBriefing = 80, + + /// + /// The StepInBriefing interaction type + /// + ReleasedForVerification = 90 + } +} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Enums/ProspectStateFilter.cs b/FoodsharingSiegen.Contracts/Enums/ProspectStateFilter.cs new file mode 100644 index 0000000..f259a0c --- /dev/null +++ b/FoodsharingSiegen.Contracts/Enums/ProspectStateFilter.cs @@ -0,0 +1,13 @@ +namespace FoodsharingSiegen.Contracts.Enums +{ + public enum ProspectStateFilter + { + All = 0, + + OnBoarding = 10, + + Verification = 20, + + Completed = 30 + } +} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Enums/RecordState.cs b/FoodsharingSiegen.Contracts/Enums/RecordState.cs new file mode 100644 index 0000000..1036afb --- /dev/null +++ b/FoodsharingSiegen.Contracts/Enums/RecordState.cs @@ -0,0 +1,12 @@ +namespace FoodsharingSiegen.Contracts.Enums +{ + /// + /// Represents the state of a record within the system. + /// + public enum RecordState + { + Default = 10, + + Deleted = 20 + } +} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Enums/UserGroup.cs b/FoodsharingSiegen.Contracts/Enums/UserGroup.cs new file mode 100644 index 0000000..cd43926 --- /dev/null +++ b/FoodsharingSiegen.Contracts/Enums/UserGroup.cs @@ -0,0 +1,28 @@ +namespace FoodsharingSiegen.Contracts.Enums +{ + /// + /// The user group enum + /// + public enum UserGroup + { + /// + /// The read only user group + /// + ReadOnly = 100, + + /// + /// The welcome team user group + /// + WelcomeTeam = 200, + + /// + /// The store manager user group + /// + StoreManager = 300, + + /// + /// The ambassador user group + /// + Ambassador = 400 + } +} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Enums/UserType.cs b/FoodsharingSiegen.Contracts/Enums/UserType.cs new file mode 100644 index 0000000..27c2148 --- /dev/null +++ b/FoodsharingSiegen.Contracts/Enums/UserType.cs @@ -0,0 +1,23 @@ +namespace FoodsharingSiegen.Contracts.Enums +{ + /// + /// The user type enum + /// + public enum UserType + { + /// + /// The unverified user type + /// + Unverified = 100, + + /// + /// The user user type + /// + User = 200, + + /// + /// The admin user type + /// + Admin = 300 + } +} \ No newline at end of file diff --git a/FoodsharingSiegen.Contracts/Helper/AttributeExtensions.cs b/FoodsharingSiegen.Contracts/Helper/AttributeExtensions.cs index 0d5c96e..4e64ee4 100644 --- a/FoodsharingSiegen.Contracts/Helper/AttributeExtensions.cs +++ b/FoodsharingSiegen.Contracts/Helper/AttributeExtensions.cs @@ -14,7 +14,7 @@ namespace FoodsharingSiegen.Contracts.Helper /// /// The enum val /// The string - public static string GetCustomValue(this Enum enumVal) + public static string GetCustomValue(this System.Enum enumVal) { var attribute = enumVal.GetAttributeOfType(); return attribute?.Value ?? string.Empty; @@ -30,7 +30,7 @@ namespace FoodsharingSiegen.Contracts.Helper /// The /// The enum val /// The - private static T? GetAttributeOfType(this Enum enumVal) where T : Attribute + private static T? GetAttributeOfType(this System.Enum enumVal) where T : Attribute { var type = enumVal.GetType(); var memInfo = type.GetMember(enumVal.ToString()); diff --git a/FoodsharingSiegen.Contracts/Helper/EntityExtensions.cs b/FoodsharingSiegen.Contracts/Helper/EntityExtensions.cs index 8fec741..f73c91d 100644 --- a/FoodsharingSiegen.Contracts/Helper/EntityExtensions.cs +++ b/FoodsharingSiegen.Contracts/Helper/EntityExtensions.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; namespace FoodsharingSiegen.Contracts.Helper { diff --git a/FoodsharingSiegen.Contracts/Model/Parameters.cs b/FoodsharingSiegen.Contracts/Model/Parameters.cs index e6b0921..37535eb 100644 --- a/FoodsharingSiegen.Contracts/Model/Parameters.cs +++ b/FoodsharingSiegen.Contracts/Model/Parameters.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; namespace FoodsharingSiegen.Contracts.Model { diff --git a/FoodsharingSiegen.Server/Auth/AuthService.cs b/FoodsharingSiegen.Server/Auth/AuthService.cs index 58a31e6..72ded49 100644 --- a/FoodsharingSiegen.Server/Auth/AuthService.cs +++ b/FoodsharingSiegen.Server/Auth/AuthService.cs @@ -1,5 +1,6 @@ using FoodsharingSiegen.Contracts; using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Helper; using FoodsharingSiegen.Server.Data; using FoodsharingSiegen.Server.Service; diff --git a/FoodsharingSiegen.Server/Controls/InteractionRow.razor b/FoodsharingSiegen.Server/Controls/InteractionRow.razor index e4a0183..9beaaf2 100644 --- a/FoodsharingSiegen.Server/Controls/InteractionRow.razor +++ b/FoodsharingSiegen.Server/Controls/InteractionRow.razor @@ -1,4 +1,5 @@ @using FoodsharingSiegen.Contracts.Entity +@using FoodsharingSiegen.Contracts.Enums @using FoodsharingSiegen.Shared.Helper @inherits FsBase @@ -30,9 +31,9 @@ } - @if (!string.IsNullOrWhiteSpace(interaction.Info)) + @if (!string.IsNullOrWhiteSpace(interaction.Info1)) { - (@interaction.Info) + (@interaction.Info1) } } diff --git a/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs b/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs index b7bac36..46ab37d 100644 --- a/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs +++ b/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Server.BaseClasses; using Microsoft.AspNetCore.Components; diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor index 6d7f263..eab4b38 100644 --- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor +++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor @@ -1,4 +1,5 @@ -@using FoodsharingSiegen.Shared.Helper +@using FoodsharingSiegen.Contracts.Enums +@using FoodsharingSiegen.Shared.Helper @inherits FsBase @{ diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs index 6ea8b2e..2b785f1 100644 --- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs +++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Server.Data.Service; using FoodsharingSiegen.Server.Dialogs; using FoodsharingSiegen.Shared.Helper; diff --git a/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor b/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor index 938f945..61946f6 100644 --- a/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor +++ b/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor @@ -1,4 +1,5 @@ -@using FoodsharingSiegen.Contracts.Model +@using FoodsharingSiegen.Contracts.Enums +@using FoodsharingSiegen.Contracts.Model @inherits FsBase @code { diff --git a/FoodsharingSiegen.Server/Controls/ProspectGrid.razor b/FoodsharingSiegen.Server/Controls/ProspectGrid.razor index 6aff845..328f4fa 100644 --- a/FoodsharingSiegen.Server/Controls/ProspectGrid.razor +++ b/FoodsharingSiegen.Server/Controls/ProspectGrid.razor @@ -1,4 +1,5 @@ -@code { +@using FoodsharingSiegen.Contracts.Enums +@code { [Parameter] public List? Prospects { get; set; } diff --git a/FoodsharingSiegen.Server/Data/AuditHelper.cs b/FoodsharingSiegen.Server/Data/AuditHelper.cs index 252d419..5425cbe 100644 --- a/FoodsharingSiegen.Server/Data/AuditHelper.cs +++ b/FoodsharingSiegen.Server/Data/AuditHelper.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; namespace FoodsharingSiegen.Server.Data { diff --git a/FoodsharingSiegen.Server/Data/Service/AuditService.cs b/FoodsharingSiegen.Server/Data/Service/AuditService.cs index 5223049..dd3b715 100644 --- a/FoodsharingSiegen.Server/Data/Service/AuditService.cs +++ b/FoodsharingSiegen.Server/Data/Service/AuditService.cs @@ -1,5 +1,6 @@ using FoodsharingSiegen.Contracts; using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Server.Auth; using Microsoft.EntityFrameworkCore; diff --git a/FoodsharingSiegen.Server/Data/Service/ProspectService.cs b/FoodsharingSiegen.Server/Data/Service/ProspectService.cs index 6ebd250..fe7112d 100644 --- a/FoodsharingSiegen.Server/Data/Service/ProspectService.cs +++ b/FoodsharingSiegen.Server/Data/Service/ProspectService.cs @@ -1,5 +1,6 @@ using FoodsharingSiegen.Contracts; using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Model; using FoodsharingSiegen.Server.Auth; using Microsoft.EntityFrameworkCore; diff --git a/FoodsharingSiegen.Server/Data/Service/UserService.cs b/FoodsharingSiegen.Server/Data/Service/UserService.cs index dcdcc91..6ffb92e 100644 --- a/FoodsharingSiegen.Server/Data/Service/UserService.cs +++ b/FoodsharingSiegen.Server/Data/Service/UserService.cs @@ -1,5 +1,6 @@ using FoodsharingSiegen.Contracts; using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Server.Auth; using Microsoft.EntityFrameworkCore; diff --git a/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor b/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor index 6913c25..197ca7e 100644 --- a/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor +++ b/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor @@ -29,7 +29,7 @@ { @InfoName - + } diff --git a/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor.cs b/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor.cs index 4294932..6f480a5 100644 --- a/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor.cs +++ b/FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor.cs @@ -1,5 +1,6 @@ using Blazorise; using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Server.BaseClasses; using FoodsharingSiegen.Server.Data.Service; using Microsoft.AspNetCore.Components; diff --git a/FoodsharingSiegen.Server/Migrations/20250401075051_Rename-Info.Designer.cs b/FoodsharingSiegen.Server/Migrations/20250401075051_Rename-Info.Designer.cs new file mode 100644 index 0000000..135d064 --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20250401075051_Rename-Info.Designer.cs @@ -0,0 +1,208 @@ +// +using System; +using FoodsharingSiegen.Server.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace FoodsharingSiegen.Server.Migrations +{ + [DbContext(typeof(FsContext))] + [Migration("20250401075051_Rename-Info")] + partial class RenameInfo + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.3"); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Audit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("Data1") + .HasColumnType("TEXT"); + + b.Property("Data2") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("UserID") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("UserID"); + + b.ToTable("Audits"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Alert") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("Date") + .HasColumnType("TEXT"); + + b.Property("Info1") + .HasColumnType("TEXT"); + + b.Property("NotNeeded") + .HasColumnType("INTEGER"); + + b.Property("ProspectID") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("UserID") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ProspectID"); + + b.HasIndex("UserID"); + + b.ToTable("Interactions"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("FsId") + .HasColumnType("INTEGER"); + + b.Property("Memo") + .HasColumnType("TEXT"); + + b.Property("Modified") + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RecordState") + .HasColumnType("INTEGER"); + + b.Property("Warning") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Prospects"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("EncryptedPassword") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ForceLogout") + .HasColumnType("INTEGER"); + + b.Property("Groups") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Mail") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Memo") + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Network") + .HasColumnType("INTEGER"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("Verified") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Audit", b => + { + b.HasOne("FoodsharingSiegen.Contracts.Entity.User", "User") + .WithMany() + .HasForeignKey("UserID"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b => + { + b.HasOne("FoodsharingSiegen.Contracts.Entity.Prospect", "Prospect") + .WithMany("Interactions") + .HasForeignKey("ProspectID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("FoodsharingSiegen.Contracts.Entity.User", "User") + .WithMany("Interactions") + .HasForeignKey("UserID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Prospect"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b => + { + b.Navigation("Interactions"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b => + { + b.Navigation("Interactions"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/20250401075051_Rename-Info.cs b/FoodsharingSiegen.Server/Migrations/20250401075051_Rename-Info.cs new file mode 100644 index 0000000..83f5f30 --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20250401075051_Rename-Info.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace FoodsharingSiegen.Server.Migrations +{ + /// + public partial class RenameInfo : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "Info", + table: "Interactions", + newName: "Info1"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "Info1", + table: "Interactions", + newName: "Info"); + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs b/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs index cf9b3a3..bfeddb8 100644 --- a/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs +++ b/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs @@ -60,7 +60,7 @@ namespace FoodsharingSiegen.Server.Migrations b.Property("Date") .HasColumnType("TEXT"); - b.Property("Info") + b.Property("Info1") .HasColumnType("TEXT"); b.Property("NotNeeded") diff --git a/FoodsharingSiegen.Server/Pages/Profile.razor b/FoodsharingSiegen.Server/Pages/Profile.razor index 498807e..1cf7789 100644 --- a/FoodsharingSiegen.Server/Pages/Profile.razor +++ b/FoodsharingSiegen.Server/Pages/Profile.razor @@ -1,5 +1,6 @@ @page "/profile" +@using FoodsharingSiegen.Contracts.Enums @inherits FsBase Profil - @AppSettings.Terms.Title diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor b/FoodsharingSiegen.Server/Pages/Prospects.razor index 14a81fd..78b736d 100644 --- a/FoodsharingSiegen.Server/Pages/Prospects.razor +++ b/FoodsharingSiegen.Server/Pages/Prospects.razor @@ -2,6 +2,7 @@ @page "/prospect" @page "/prospects" +@using FoodsharingSiegen.Contracts.Enums @using FoodsharingSiegen.Shared.Helper @inherits FsBase diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs index 3c19d5d..5f7812b 100644 --- a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs +++ b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Model; using FoodsharingSiegen.Server.Data.Service; using FoodsharingSiegen.Server.Dialogs; diff --git a/FoodsharingSiegen.Server/Pages/ProspectsAll.razor b/FoodsharingSiegen.Server/Pages/ProspectsAll.razor index f6d62da..6051744 100644 --- a/FoodsharingSiegen.Server/Pages/ProspectsAll.razor +++ b/FoodsharingSiegen.Server/Pages/ProspectsAll.razor @@ -1,5 +1,6 @@ @page "/all" +@using FoodsharingSiegen.Contracts.Enums @using FoodsharingSiegen.Shared.Helper @inherits FsBase diff --git a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor index 28bdf11..0a5fbbf 100644 --- a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor +++ b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor @@ -1,5 +1,6 @@ @page "/done" +@using FoodsharingSiegen.Contracts.Enums @using FoodsharingSiegen.Shared.Helper @inherits FsBase diff --git a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs index 48480e0..20bc792 100644 --- a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs +++ b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Model; using FoodsharingSiegen.Server.Data.Service; using Microsoft.AspNetCore.Components; diff --git a/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor b/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor index 9212620..829f783 100644 --- a/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor +++ b/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor @@ -1,5 +1,6 @@ @page "/verify" +@using FoodsharingSiegen.Contracts.Enums @using FoodsharingSiegen.Shared.Helper @inherits FsBase diff --git a/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor.cs b/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor.cs index e6b2ab4..cc2253c 100644 --- a/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor.cs +++ b/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor.cs @@ -1,4 +1,5 @@ using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Model; using FoodsharingSiegen.Server.Data.Service; using FoodsharingSiegen.Server.Dialogs; diff --git a/FoodsharingSiegen.Server/Pages/Users.razor b/FoodsharingSiegen.Server/Pages/Users.razor index 593f68a..d2cfa57 100644 --- a/FoodsharingSiegen.Server/Pages/Users.razor +++ b/FoodsharingSiegen.Server/Pages/Users.razor @@ -1,6 +1,7 @@ @page "/user" @page "/users" @using FoodsharingSiegen.Contracts.Entity +@using FoodsharingSiegen.Contracts.Enums @using FoodsharingSiegen.Server.Dialogs @inherits FoodsharingSiegen.Server.BaseClasses.FsBase diff --git a/FoodsharingSiegen.Server/Pages/Users.razor.cs b/FoodsharingSiegen.Server/Pages/Users.razor.cs index a893567..679a755 100644 --- a/FoodsharingSiegen.Server/Pages/Users.razor.cs +++ b/FoodsharingSiegen.Server/Pages/Users.razor.cs @@ -1,5 +1,6 @@ using Blazorise.DataGrid; using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Helper; using FoodsharingSiegen.Server.Data.Service; using FoodsharingSiegen.Server.Dialogs; diff --git a/FoodsharingSiegen.Shared/Helper/FilterHelper.cs b/FoodsharingSiegen.Shared/Helper/FilterHelper.cs index ab968ed..0f8db0b 100644 --- a/FoodsharingSiegen.Shared/Helper/FilterHelper.cs +++ b/FoodsharingSiegen.Shared/Helper/FilterHelper.cs @@ -1,5 +1,6 @@ using System.Linq.Expressions; using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Model; namespace FoodsharingSiegen.Shared.Helper diff --git a/FoodsharingSiegen.Shared/Helper/TermHelper.cs b/FoodsharingSiegen.Shared/Helper/TermHelper.cs index 725ae57..f028843 100644 --- a/FoodsharingSiegen.Shared/Helper/TermHelper.cs +++ b/FoodsharingSiegen.Shared/Helper/TermHelper.cs @@ -1,6 +1,7 @@ #nullable enable using FoodsharingSiegen.Contracts.Entity; +using FoodsharingSiegen.Contracts.Enums; using FoodsharingSiegen.Contracts.Model; namespace FoodsharingSiegen.Shared.Helper