diff --git a/BeReadyBackend/Endpoints/Groups/StartVoteEndpoint.cs b/BeReadyBackend/Endpoints/Groups/StartVoteEndpoint.cs
index 1fab7ec..758bf53 100644
--- a/BeReadyBackend/Endpoints/Groups/StartVoteEndpoint.cs
+++ b/BeReadyBackend/Endpoints/Groups/StartVoteEndpoint.cs
@@ -31,24 +31,16 @@ public class StartVoteEndpoint(UserGroupsRepository userGroupsRepository, Groups
await Send.NotFoundAsync(ct);
return;
}
-
- UserGroup? userGroup = group.UserGroups!.FirstOrDefault(x => x.UserId == userService.GetUserIdFromToken());
-
- if (userGroup?.Grade != "Admin")
- {
- await Send.StringAsync("Vous ne pouvez pas lancer le vote", 400, cancellation: ct);
- return;
- }
-
+
if (group.IsFinished)
{
await Send.StringAsync("Le défi est terminé", 400, cancellation: ct);
return;
}
- if (group.CreationDate.AddHours(group.Duration) > DateTime.Now)
+ if (group.CreationDate.AddHours(group.Duration) > DateTime.Now || !group.IsFinished)
{
- await Send.StringAsync("Le défi n'est pas terminé", 400, cancellation: ct);
+ await Send.StringAsync("Le défi n'est pas encore terminé", 400, cancellation: ct);
return;
}
diff --git a/BeReadyBackend/Migrations/20260323141022_AddedMissingFieldsOnGroup.Designer.cs b/BeReadyBackend/Migrations/20260323141022_AddedMissingFieldsOnGroup.Designer.cs
new file mode 100644
index 0000000..9d66fe7
--- /dev/null
+++ b/BeReadyBackend/Migrations/20260323141022_AddedMissingFieldsOnGroup.Designer.cs
@@ -0,0 +1,448 @@
+//
+using System;
+using BeReadyBackend;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BeReadyBackend.Migrations
+{
+ [DbContext(typeof(BeReadyDbContext))]
+ [Migration("20260323141022_AddedMissingFieldsOnGroup")]
+ partial class AddedMissingFieldsOnGroup
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "8.0.20")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+ modelBuilder.Entity("BeReadyBackend.Models.Achievement", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Label")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Achievements");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.Designation", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("Label")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Designations");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.Group", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Duration")
+ .HasColumnType("int");
+
+ b.Property("IsFinished")
+ .HasColumnType("bit");
+
+ b.Property("Label")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("StartedVote")
+ .HasColumnType("datetime2");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("VoteDuration")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Groups");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.Message", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("GroupId")
+ .HasColumnType("int");
+
+ b.Property("Libelle")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("SendDate")
+ .HasColumnType("datetime2");
+
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("GroupId");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("Messages");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.RandomChallenge", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("Duration")
+ .HasColumnType("int");
+
+ b.Property("GeneratedAt")
+ .IsRequired()
+ .HasColumnType("datetime2");
+
+ b.Property("IsAlreadyPast")
+ .HasColumnType("bit");
+
+ b.Property("Libelle")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.ToTable("RandomChallenges");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.User", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("DesignationId")
+ .HasColumnType("int");
+
+ b.Property("Email")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("FirstName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasMaxLength(60)
+ .HasColumnType("nvarchar(60)");
+
+ b.Property("Salt")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Score")
+ .HasColumnType("int");
+
+ b.Property("Series")
+ .HasColumnType("int");
+
+ b.Property("TotalBonusChallenge")
+ .HasColumnType("int");
+
+ b.Property("TotalChallenge")
+ .HasColumnType("int");
+
+ b.Property("TotalPodium")
+ .HasColumnType("int");
+
+ b.Property("TotalWin")
+ .HasColumnType("int");
+
+ b.Property("Username")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DesignationId");
+
+ b.ToTable("Users");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserAchievement", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.Property("AchievementId")
+ .HasColumnType("int");
+
+ b.HasKey("UserId", "AchievementId");
+
+ b.HasIndex("AchievementId");
+
+ b.ToTable("UserAchievements");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserFriend", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.Property("FriendId")
+ .HasColumnType("int");
+
+ b.Property("IsAccepted")
+ .HasColumnType("bit");
+
+ b.HasKey("UserId", "FriendId");
+
+ b.HasIndex("FriendId");
+
+ b.ToTable("UserFriends");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserGroup", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.Property("GroupId")
+ .HasColumnType("int");
+
+ b.Property("Grade")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Proof")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Score")
+ .HasColumnType("int");
+
+ b.Property("VotedProofId")
+ .HasColumnType("int");
+
+ b.HasKey("UserId", "GroupId");
+
+ b.HasIndex("GroupId");
+
+ b.ToTable("UserGroups");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserRandomChallenge", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("int");
+
+ b.Property("RandomChallengeId")
+ .HasColumnType("int");
+
+ b.Property("Proof")
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("UserId", "RandomChallengeId");
+
+ b.HasIndex("RandomChallengeId");
+
+ b.ToTable("UserRandomChallenges");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.Message", b =>
+ {
+ b.HasOne("BeReadyBackend.Models.Group", "Group")
+ .WithMany("Messages")
+ .HasForeignKey("GroupId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("BeReadyBackend.Models.User", "User")
+ .WithMany("Messages")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Group");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.User", b =>
+ {
+ b.HasOne("BeReadyBackend.Models.Designation", "Designation")
+ .WithMany("Users")
+ .HasForeignKey("DesignationId");
+
+ b.Navigation("Designation");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserAchievement", b =>
+ {
+ b.HasOne("BeReadyBackend.Models.Achievement", "Achievement")
+ .WithMany("UserAchievements")
+ .HasForeignKey("AchievementId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("BeReadyBackend.Models.User", "User")
+ .WithMany("UserAchievements")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Achievement");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserFriend", b =>
+ {
+ b.HasOne("BeReadyBackend.Models.User", "Friend")
+ .WithMany()
+ .HasForeignKey("FriendId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("BeReadyBackend.Models.User", "User")
+ .WithMany("UserFriends")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("Friend");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserGroup", b =>
+ {
+ b.HasOne("BeReadyBackend.Models.Group", "Group")
+ .WithMany("UserGroups")
+ .HasForeignKey("GroupId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("BeReadyBackend.Models.User", "User")
+ .WithMany("UserGroups")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Group");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.UserRandomChallenge", b =>
+ {
+ b.HasOne("BeReadyBackend.Models.RandomChallenge", "RandomChallenge")
+ .WithMany("UserRandomChallenges")
+ .HasForeignKey("RandomChallengeId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("BeReadyBackend.Models.User", "User")
+ .WithMany("UserRandomChallenges")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("RandomChallenge");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.Achievement", b =>
+ {
+ b.Navigation("UserAchievements");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.Designation", b =>
+ {
+ b.Navigation("Users");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.Group", b =>
+ {
+ b.Navigation("Messages");
+
+ b.Navigation("UserGroups");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.RandomChallenge", b =>
+ {
+ b.Navigation("UserRandomChallenges");
+ });
+
+ modelBuilder.Entity("BeReadyBackend.Models.User", b =>
+ {
+ b.Navigation("Messages");
+
+ b.Navigation("UserAchievements");
+
+ b.Navigation("UserFriends");
+
+ b.Navigation("UserGroups");
+
+ b.Navigation("UserRandomChallenges");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/BeReadyBackend/Migrations/20260323141022_AddedMissingFieldsOnGroup.cs b/BeReadyBackend/Migrations/20260323141022_AddedMissingFieldsOnGroup.cs
new file mode 100644
index 0000000..19713c9
--- /dev/null
+++ b/BeReadyBackend/Migrations/20260323141022_AddedMissingFieldsOnGroup.cs
@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BeReadyBackend.Migrations
+{
+ ///
+ public partial class AddedMissingFieldsOnGroup : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "StartedVote",
+ table: "Groups",
+ type: "datetime2",
+ nullable: true);
+
+ migrationBuilder.AddColumn(
+ name: "VoteDuration",
+ table: "Groups",
+ type: "int",
+ nullable: true);
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "StartedVote",
+ table: "Groups");
+
+ migrationBuilder.DropColumn(
+ name: "VoteDuration",
+ table: "Groups");
+ }
+ }
+}
diff --git a/BeReadyBackend/Migrations/BeReadyDbContextModelSnapshot.cs b/BeReadyBackend/Migrations/BeReadyDbContextModelSnapshot.cs
index ee291d5..6cad47e 100644
--- a/BeReadyBackend/Migrations/BeReadyDbContextModelSnapshot.cs
+++ b/BeReadyBackend/Migrations/BeReadyDbContextModelSnapshot.cs
@@ -85,10 +85,16 @@ namespace BeReadyBackend.Migrations
.IsRequired()
.HasColumnType("nvarchar(max)");
+ b.Property("StartedVote")
+ .HasColumnType("datetime2");
+
b.Property("Title")
.IsRequired()
.HasColumnType("nvarchar(max)");
+ b.Property("VoteDuration")
+ .HasColumnType("int");
+
b.HasKey("Id");
b.ToTable("Groups");
diff --git a/BeReadyBackend/Models/Group.cs b/BeReadyBackend/Models/Group.cs
index b99d30d..25a6479 100644
--- a/BeReadyBackend/Models/Group.cs
+++ b/BeReadyBackend/Models/Group.cs
@@ -12,6 +12,8 @@ public class Group
[Required, Length(2, 200)] public string? Description { get; set; }
[Required] public int Duration { get; set; }
[Required] public DateTime CreationDate { get; set; }
+ public DateTime? StartedVote { get; set; }
+ public int? VoteDuration { get; set; } = 3;
public List? Messages { get; set; }
public List? UserGroups { get; set; }
diff --git a/obj/BookHive.EntityFrameworkCore.targets b/obj/BookHive.EntityFrameworkCore.targets
new file mode 100644
index 0000000..7d6485d
--- /dev/null
+++ b/obj/BookHive.EntityFrameworkCore.targets
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+