Fix status code errors

Author: TheEpicBlock

common/src/main/java/net/modfest/platform/pojo/PlatformErrorResponse.java

@@ -2,13 +2,15 @@
 
 import com.google.gson.JsonElement;
 import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 /**
  * The standard way that platform returns errors
  */
 public record PlatformErrorResponse(
 	@NonNull ErrorType type,
-	@NonNull JsonElement data
+	@NonNull JsonElement data,
+	@Nullable Integer overrideStatusCode
 ) {
 	public enum ErrorType {
 		/**

platform_api/src/main/java/net/modfest/platform/controller/PlatformExceptionHandler.java

@@ -30,23 +30,26 @@ public class PlatformExceptionHandler {
 	private ResponseEntity<PlatformErrorResponse> platformException(PlatformStandardException t) {
 		return toResponse(new PlatformErrorResponse(
 			t.getType(),
-			gson.toJsonTree(t.getData())
+			gson.toJsonTree(t.getData()),
+			t.getStatusCodeOverride()
 		));
 	}
 
 	@ExceptionHandler(UnauthenticatedException.class)
 	private ResponseEntity<PlatformErrorResponse> unauthenticatedException(UnauthenticatedException e) {
 		return toResponse(new PlatformErrorResponse(
 			PlatformErrorResponse.ErrorType.PERMISSION_ERROR,
-			gson.toJsonTree("user is not logged in")
+			gson.toJsonTree("user is not logged in"),
+			null
 		));
 	}
 
 	@ExceptionHandler({AuthorizationException.class, AuthenticationException.class})
 	private ResponseEntity<PlatformErrorResponse> authorizationException(ShiroException e) {
 		return toResponse(new PlatformErrorResponse(
 			PlatformErrorResponse.ErrorType.PERMISSION_ERROR,
-			gson.toJsonTree(e.toString())
+			gson.toJsonTree(e.toString()),
+			null
 		));
 	}
 
@@ -59,22 +62,24 @@ private ResponseEntity<PlatformErrorResponse> anyError(Throwable t) {
 			return new ResponseEntity<>(
 				new PlatformErrorResponse(
 					PlatformErrorResponse.ErrorType.INTERNAL,
-					gson.toJsonTree(e.getBody())
+					gson.toJsonTree(e.getBody()),
+					null
 				),
 				e.getStatusCode()
 			);
 		}
 		t.printStackTrace();
 		return toResponse(new PlatformErrorResponse(
 			PlatformErrorResponse.ErrorType.INTERNAL,
-			gson.toJsonTree(t.toString())
+			gson.toJsonTree(t.toString()),
+			null
 		));
 	}
 
 	private static ResponseEntity<PlatformErrorResponse> toResponse(PlatformErrorResponse errorResponse) {
 		return new ResponseEntity<>(
 			errorResponse,
-			HttpStatusCode.valueOf(errorResponse.type().httpStatus)
+			HttpStatusCode.valueOf(errorResponse.overrideStatusCode() == null ? errorResponse.type().httpStatus : errorResponse.overrideStatusCode())
 		);
 	}
 }

platform_api/src/main/java/net/modfest/platform/controller/UserController.java

@@ -123,7 +123,7 @@ public UserData getSingleUser(@PathVariable String id) throws PlatformStandardEx
 		}
 
 		if (user == null) {
-			throw PlatformStandardException.doesntExist(PlatformErrorResponse.IdType.MFUSER, id);
+			throw PlatformStandardException.doesntExist(PlatformErrorResponse.IdType.MFUSER, id).statusCode(404);
 		}
 		return user;
 	}

platform_api/src/main/java/net/modfest/platform/misc/PlatformStandardException.java

@@ -7,6 +7,7 @@
 public class PlatformStandardException extends Exception {
 	private final PlatformErrorResponse.ErrorType type;
 	private final Object data;
+	private Integer statusCodeOverride = null;
 
 	public PlatformStandardException(PlatformErrorResponse.ErrorType type, Object data) {
 		this.type = type;
@@ -18,6 +19,11 @@ public String getMessage() {
 		return this.type+": "+this.data;
 	}
 
+	public PlatformStandardException statusCode(int code) {
+		statusCodeOverride = code;
+		return this;
+	}
+
 	public static PlatformStandardException doesntExist(PlatformErrorResponse.IdType type, String id) {
 		return new PlatformStandardException(PlatformErrorResponse.ErrorType.DOESNT_EXIST, new PlatformErrorResponse.DoesntExist(type, id));
 	}