Field removal subcommand improvements

Author: Defective4

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

@@ -52,10 +52,6 @@ public void execute(SlashCommandInteractionEvent event) {
 			return;
 		}
 		FormData form = formOpt.get();
-		if (index < 0 || index >= form.fields().size()) {
-			event.getHook().sendMessage("Field index out of bounds.").queue();
-			return;
-		}
 
 		if (form.isAttached() && form.fields().size() <= 1) {
 			event.getHook().sendMessage(
@@ -64,7 +60,10 @@ public void execute(SlashCommandInteractionEvent event) {
 			return;
 		}
 
-		formsRepo.removeField(form, index);
+		if (!formsRepo.removeField(form, index)) {
+			event.getHook().sendMessage("A field on this index was not found.").queue();
+			return;
+		}
 
 		event.getHook().sendMessage("Removed field `" + form.fields().get(index).label() + "` from the form.").queue();
 	}

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

@@ -11,10 +11,12 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
+
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormData;
@@ -238,11 +240,12 @@ public void addSubmission(User user, FormData form, Message message) {
 	 *
 	 * @param form  form to remove the field from
 	 * @param index index of the field to remove
+	 * @return 
 	 */
-	public void removeField(FormData form, int index) {
+	public boolean removeField(FormData form, int index) {
 		List<FormField> fields = form.fields();
-		if (index < 0 || index >= fields.size()) return;
-		jdbcTemplate.update("delete from `form_fields` where `id` = ?", fields.get(index).id());
+		if (index < 0 || index >= fields.size()) return false;
+		return jdbcTemplate.update("delete from `form_fields` where `id` = ?", fields.get(index).id()) > 0;
 	}
 
 	/**