Address the remaining issues

Author: Defective4

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/AddFieldFormSubcommand.java

@@ -18,6 +18,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.dv8tion.jda.api.modals.Modal;
 import xyz.dynxsty.dih4jda.interactions.AutoCompletable;
 
 /**
@@ -74,7 +75,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		}
 		FormData form = formOpt.get();
 
-		if (form.fields().size() >= Message.MAX_COMPONENT_COUNT) {
+		if (form.fields().size() >= Modal.MAX_COMPONENTS) {
 			Responses.error(event, "Can't add more than %s components to a form", Message.MAX_COMPONENT_COUNT).queue();
 			return;
 		}

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/ReopenFormSubcommand.java

@@ -1,7 +1,6 @@
 package net.discordjug.javabot.systems.staff_commands.forms.commands;
 
 import java.util.Optional;
-
 import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.systems.staff_commands.forms.FormInteractionManager;
 import net.discordjug.javabot.systems.staff_commands.forms.dao.FormsRepository;
@@ -60,6 +59,11 @@ public void execute(SlashCommandInteractionEvent event) {
 			return;
 		}
 
+		if (form.hasExpired()) {
+			Responses.error(event, "You can't reopen an expired form").queue();
+			return;
+		}
+
 		event.deferReply(true).queue();
 
 		interactionManager.reopenForm(event.getGuild(), form);

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/dao/FormsRepository.java

@@ -152,7 +152,7 @@ public Map<FormUser, Integer> getSubmissionsCountPerUser(FormData form) {
 	 * Get a form for given ID.
 	 *
 	 * @param formId form ID to query
-	 * @return optional form
+	 * @return the obtained form or {@link Optional#empty()}
 	 */
 	public Optional<FormData> getForm(long formId) {
 		try {

src/main/resources/database/migrations/09-08-2025_forms.sql

@@ -26,12 +26,11 @@ CREATE TABLE form_fields (
 );
 
 CREATE TABLE form_submissions (
-    id BIGINT NOT NULL AUTO_INCREMENT,
     message_id BIGINT NOT NULL,
     user_id BIGINT NOT NULL,
     form_id BIGINT NOT NULL,
     user_name VARCHAR NOT NULL,
-    PRIMARY KEY (id),
+    PRIMARY KEY (message_id),
     FOREIGN KEY (form_id) REFERENCES FORMS(form_id) ON DELETE CASCADE ON UPDATE RESTRICT
 );