From f026f24263fe70af11e7e5f997cdfde3aa7dd879 Mon Sep 17 00:00:00 2001 From: akastijn Date: Thu, 14 Aug 2025 02:34:28 +0200 Subject: [PATCH] Refactor `createAppeal` in `AppealMapper` to void return type, adjust `AppealController` to remove redundant `UUID` handling. Optimize `AppealDataMapper` to use `UUID.randomUUID()`. --- .../altitudeweb/controllers/forms/AppealController.java | 7 ++----- .../com/alttd/altitudeweb/mappers/AppealDataMapper.java | 4 +++- .../altitudeweb/database/web_db/forms/AppealMapper.java | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/com/alttd/altitudeweb/controllers/forms/AppealController.java b/backend/src/main/java/com/alttd/altitudeweb/controllers/forms/AppealController.java index 6f80cf1..0531357 100644 --- a/backend/src/main/java/com/alttd/altitudeweb/controllers/forms/AppealController.java +++ b/backend/src/main/java/com/alttd/altitudeweb/controllers/forms/AppealController.java @@ -46,11 +46,8 @@ public class AppealController implements AppealsApi { log.debug("Loading history by id"); try { Appeal appeal = mapper.minecraftAppealDtoToAppeal(minecraftAppealDto); - UUID appealId = sqlSession.getMapper(AppealMapper.class) - .createAppeal(appeal); - Appeal finalAppeal = new Appeal(appealId, appeal.uuid(), appeal.username(), appeal.reason(), - appeal.createdAt(), appeal.sendAt(), appeal.email(), appeal.assignedTo()); - appealCompletableFuture.complete(finalAppeal); + sqlSession.getMapper(AppealMapper.class).createAppeal(appeal); + appealCompletableFuture.complete(appeal); } catch (Exception e) { log.error("Failed to load history count", e); appealCompletableFuture.completeExceptionally(e); diff --git a/backend/src/main/java/com/alttd/altitudeweb/mappers/AppealDataMapper.java b/backend/src/main/java/com/alttd/altitudeweb/mappers/AppealDataMapper.java index a4fee7e..ba0d640 100644 --- a/backend/src/main/java/com/alttd/altitudeweb/mappers/AppealDataMapper.java +++ b/backend/src/main/java/com/alttd/altitudeweb/mappers/AppealDataMapper.java @@ -4,6 +4,8 @@ import com.alttd.altitudeweb.database.web_db.forms.Appeal; import com.alttd.altitudeweb.model.MinecraftAppealDto; import org.springframework.stereotype.Service; +import java.util.UUID; + @Service public class AppealDataMapper { public MinecraftAppealDto appealToMinecraftAppealDto(Appeal appeal) { @@ -17,7 +19,7 @@ public class AppealDataMapper { public Appeal minecraftAppealDtoToAppeal(MinecraftAppealDto minecraftAppealDto) { return new Appeal( - null, + UUID.randomUUID(), minecraftAppealDto.getUuid(), minecraftAppealDto.getUsername(), minecraftAppealDto.getAppeal(), diff --git a/database/src/main/java/com/alttd/altitudeweb/database/web_db/forms/AppealMapper.java b/database/src/main/java/com/alttd/altitudeweb/database/web_db/forms/AppealMapper.java index 4b3d4cf..09b6d34 100644 --- a/database/src/main/java/com/alttd/altitudeweb/database/web_db/forms/AppealMapper.java +++ b/database/src/main/java/com/alttd/altitudeweb/database/web_db/forms/AppealMapper.java @@ -1,12 +1,10 @@ package com.alttd.altitudeweb.database.web_db.forms; import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; -import java.util.UUID; public interface AppealMapper { @@ -14,8 +12,7 @@ public interface AppealMapper { INSERT INTO appeals (uuid, username, reason, created_at, send_at, e_mail, assigned_to) VALUES (#{uuid}, #{username}, #{reason}, #{createdAt}, #{sendAt}, #{email}, #{assignedTo}) """) - @Options(useGeneratedKeys = true, keyProperty = "id") - UUID createAppeal(Appeal appeal); + void createAppeal(Appeal appeal); @Update(""" UPDATE appeals