Changed submissions table structure to use unique ids

Author: Defective4

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/FormInteractionManager.java

@@ -149,8 +149,9 @@ public void handleModal(ModalInteractionEvent event, List<ModalMapping> values)
 			return;
 		}
 
-		channel.sendMessageEmbeds(createSubmissionEmbed(form, values, event.getMember())).queue();
-		formsRepo.logSubmission(event.getUser(), form);
+		channel.sendMessageEmbeds(createSubmissionEmbed(form, values, event.getMember())).queue(msg -> {
+			formsRepo.logSubmission(event.getUser(), form, msg);
+		});
 
 		event.getHook()
 				.sendMessage(

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

@@ -4,6 +4,7 @@
 
 import net.discordjug.javabot.systems.staff_commands.forms.dao.FormsRepository;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormData;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.AutoCompleteQuery;
@@ -29,11 +30,9 @@ public class SubmissionsDeleteFormSubcommand extends Subcommand implements AutoC
 	 */
 	public SubmissionsDeleteFormSubcommand(FormsRepository formsRepo) {
 		this.formsRepo = formsRepo;
-		setCommandData(
-				new SubcommandData("submissions-delete", "Deletes submissions of an user in the form").addOptions(
-						new OptionData(OptionType.INTEGER, "form-id", "The ID of a form to get submissions for", true,
-								true),
-						new OptionData(OptionType.STRING, "user-id", "User to delete submissions of", true, true)));
+		setCommandData(new SubcommandData("submissions-delete", "Deletes submissions of an user in the form")
+				.addOptions(new OptionData(OptionType.INTEGER, "form-id", "The ID of a form to get submissions for",
+						true, true), new OptionData(OptionType.USER, "user", "User to delete submissions of", true)));
 	}
 
 	@Override
@@ -45,7 +44,7 @@ public void execute(SlashCommandInteractionEvent event) {
 			return;
 		}
 
-		String user = event.getOption("user-id", OptionMapping::getAsString);
+		User user = event.getOption("user", OptionMapping::getAsUser);
 		FormData form = formOpt.get();
 
 		int count = formsRepo.deleteSubmissions(form, user);
@@ -54,24 +53,8 @@ public void execute(SlashCommandInteractionEvent event) {
 
 	@Override
 	public void handleAutoComplete(CommandAutoCompleteInteractionEvent event, AutoCompleteQuery target) {
-		switch (target.getName()) {
-			case "user-id" -> {
-				Long formId = event.getOption("form-id", OptionMapping::getAsLong);
-				if (formId != null) {
-					Optional<FormData> form = formsRepo.getForm(formId);
-					if (form.isPresent()) {
-						event.replyChoices(formsRepo.getAllSubmissions(form.get()).keySet().stream()
-								.map(user -> new Choice(user.getUsername(), Long.toString(user.getId()))).toList())
-								.queue();
-						return;
-					}
-				}
-				event.replyChoices().queue();
-			}
-			case "form-id" -> event.replyChoices(
-					formsRepo.getAllForms().stream().map(form -> new Choice(form.toString(), form.getId())).toList())
-					.queue();
-			default -> {}
-		}
+		event.replyChoices(
+				formsRepo.getAllForms().stream().map(form -> new Choice(form.toString(), form.getId())).toList())
+				.queue();
 	}
 }

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

@@ -80,17 +80,6 @@ public void closeForm(FormData form) {
 	 */
 	public void deleteForm(FormData form) {
 		jdbcTemplate.update("delete from `forms` where `form_id` = ?", form.getId());
-		deleteSubmissions(form);
-	}
-
-	/**
-	 * Deletes all submissions for this form.
-	 *
-	 * @param form form to delete submissions for.
-	 */
-	public void deleteSubmissions(FormData form) {
-		Objects.requireNonNull(form);
-		jdbcTemplate.update("delete from `form_submissions` where `form_id` = ?", form.getId());
 	}
 
 	/**
@@ -100,11 +89,11 @@ public void deleteSubmissions(FormData form) {
 	 * @param user user to delete submissions for
 	 * @return number of deleted submissions
 	 */
-	public int deleteSubmissions(FormData form, String user) {
+	public int deleteSubmissions(FormData form, User user) {
 		Objects.requireNonNull(form);
 		Objects.requireNonNull(user);
 		return jdbcTemplate.update("delete from `form_submissions` where `form_id` = ? and `user_id` = ?", form.getId(),
-				user);
+				user.getIdLong());
 	}
 
 	/**
@@ -197,7 +186,7 @@ public boolean hasSubmitted(User user, FormData form) {
 		try {
 			return jdbcTemplate.queryForObject(
 					"select * from `form_submissions` where `user_id` = ? and `form_id` = ? limit 1",
-					(rs, rowNum) -> true, user.getId(), form.getId());
+					(rs, rowNum) -> true, user.getIdLong(), form.getId());
 		} catch (EmptyResultDataAccessException e) {
 			return false;
 		}
@@ -231,17 +220,18 @@ public PreparedStatement createPreparedStatement(Connection con) throws SQLExcep
 	/**
 	 * Log an user form submission in database.
 	 *
-	 * @param user user to log
-	 * @param form form to log on
+	 * @param user    user to log
+	 * @param form    form to log on
+	 * @param message message containing details about this user's submission
 	 */
-	public void logSubmission(User user, FormData form) {
+	public void logSubmission(User user, FormData form, Message message) {
 		Objects.requireNonNull(user);
 		Objects.requireNonNull(form);
 		jdbcTemplate.update(con -> {
 			PreparedStatement statement = con.prepareStatement(
-					"merge into `form_submissions` (\"timestamp\", `user_id`, `form_id`, `user_name`) values (?, ?, ?, ?)");
-			statement.setLong(1, System.currentTimeMillis());
-			statement.setString(2, user.getId());
+					"insert into `form_submissions` (`message_id`, `user_id`, `form_id`, `user_name`) values (?, ?, ?, ?)");
+			statement.setLong(1, message.getIdLong());
+			statement.setLong(2, user.getIdLong());
 			statement.setLong(3, form.getId());
 			statement.setString(4, user.getName());
 			return statement;

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

@@ -25,12 +25,14 @@ CREATE TABLE FORM_FIELDS (
     FOREIGN KEY (FORM_ID) REFERENCES FORMS(FORM_ID) ON DELETE CASCADE ON UPDATE RESTRICT
 );
 
-CREATE TABLE form_submissions (
-    "timestamp" BIGINT NOT NULL,
-    user_id VARCHAR NOT NULL,
-    form_id BIGINT NOT NULL,
-    user_name VARCHAR NOT NULL,
-    PRIMARY KEY ("timestamp")
+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),
+    FOREIGN KEY (FORM_ID) REFERENCES FORMS(FORM_ID) ON DELETE CASCADE ON UPDATE RESTRICT
 );
 
 CREATE INDEX FORM_SUBMISSIONS_USER_ID_IDX ON form_submissions (user_id,form_id);