Fix failing tests and remove redundant helper class

Author: Sporiff

src/main/java/org/openpodcastapi/opa/auth/JwtAccessDeniedHandler.java

@@ -1,8 +1,9 @@
 package org.openpodcastapi.opa.auth;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.openpodcastapi.opa.util.JSONFormatter;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
@@ -11,7 +12,10 @@
 import java.io.IOException;
 
 @Component
+@RequiredArgsConstructor
 public class JwtAccessDeniedHandler implements AccessDeniedHandler {
+    private final ObjectMapper objectMapper;
+
     @Override
     public void handle(HttpServletRequest request,
                        HttpServletResponse response,
@@ -25,6 +29,6 @@ public void handle(HttpServletRequest request,
 
         AuthDTO.ErrorMessageDTO message = new AuthDTO.ErrorMessageDTO("Forbidden", "You do not have permission to access this resource");
 
-        response.getWriter().write(JSONFormatter.parseDataToJSON(message));
+        response.getWriter().write(objectMapper.writeValueAsString(message));
     }
 }

src/main/java/org/openpodcastapi/opa/auth/JwtAuthenticationEntryPoint.java

@@ -1,8 +1,9 @@
 package org.openpodcastapi.opa.auth;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.openpodcastapi.opa.util.JSONFormatter;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -11,7 +12,10 @@
 import java.io.IOException;
 
 @Component
+@RequiredArgsConstructor
 public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
+    private final ObjectMapper objectMapper;
+
     /// Returns a 401 when a request is made without a valid bearer token
     @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
@@ -23,6 +27,6 @@ public void commence(HttpServletRequest request, HttpServletResponse response, A
 
         AuthDTO.ErrorMessageDTO message = new AuthDTO.ErrorMessageDTO("Access denied", "You need to log in to access this resource");
 
-        response.getWriter().write(JSONFormatter.parseDataToJSON(message));
+        response.getWriter().write(objectMapper.writeValueAsString(message));
     }
 }

src/main/java/org/openpodcastapi/opa/security/TokenService.java

@@ -74,8 +74,8 @@ public String generateRefreshToken(UserEntity userEntity) {
 
     /// Validates the refresh token for a userEntity and updates its expiry time
     ///
-    /// @param rawToken the raw token to validate
-    /// @param userEntity     the [UserEntity] to validate the token for
+    /// @param rawToken   the raw token to validate
+    /// @param userEntity the [UserEntity] to validate the token for
     /// @return the validated [UserEntity]
     public UserEntity validateRefreshToken(String rawToken, UserEntity userEntity) {
         // Only fetch refresh tokens for the requesting userEntity

src/main/java/org/openpodcastapi/opa/subscription/SubscriptionService.java

@@ -79,7 +79,7 @@ public Page<SubscriptionDTO.UserSubscriptionDTO> getAllActiveSubscriptionsForUse
     /// If an existing entry is found for the userEntity and subscriptionEntity, the `isSubscribed` property is set to `true`
     ///
     /// @param subscriptionEntity the target subscriptionEntity
-    /// @param userId       the ID of the target userEntity
+    /// @param userId             the ID of the target userEntity
     /// @return a [SubscriptionDTO.UserSubscriptionDTO] representation of the subscriptionEntity link
     /// @throws EntityNotFoundException if no matching userEntity is found
     protected SubscriptionDTO.UserSubscriptionDTO persistUserSubscription(SubscriptionEntity subscriptionEntity, Long userId) {
@@ -90,7 +90,7 @@ protected SubscriptionDTO.UserSubscriptionDTO persistUserSubscription(Subscripti
             log.debug("Creating new userEntity subscriptionEntity for userEntity {} and subscriptionEntity {}", userId, subscriptionEntity.getUuid());
             UserSubscriptionEntity createdSubscription = new UserSubscriptionEntity();
             createdSubscription.setIsSubscribed(true);
-            createdSubscription.setUserEntity(userEntity);
+            createdSubscription.setUser(userEntity);
             createdSubscription.setSubscription(subscriptionEntity);
             return userSubscriptionRepository.save(createdSubscription);
         });

src/main/java/org/openpodcastapi/opa/subscription/UserSubscriptionEntity.java

@@ -25,7 +25,7 @@ public class UserSubscriptionEntity {
 
     @ManyToOne
     @JoinColumn(name = "user_id")
-    private UserEntity userEntity;
+    private UserEntity user;
 
     @ManyToOne
     @JoinColumn(name = "subscription_id")

src/main/java/org/openpodcastapi/opa/util/JSONFormatter.java

@@ -49,7 +49,7 @@ void testToDto() {
 
         UserSubscriptionEntity userSubscriptionEntity = UserSubscriptionEntity.builder()
                 .uuid(uuid)
-                .userEntity(userEntity)
+                .user(userEntity)
                 .subscription(subscriptionEntity)
                 .isSubscribed(true)
                 .createdAt(timestamp)