Improve unit testing for mapping logic

Author: Sporiff

src/main/java/org/openpodcastapi/opa/subscription/model/Subscription.java

@@ -1,18 +1,17 @@
 package org.openpodcastapi.opa.subscription.model;
 
 import jakarta.persistence.*;
-import lombok.Generated;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.Instant;
 import java.util.Set;
 import java.util.UUID;
 
 @Entity
-@Table(name = "subscriptions")
 @NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Table(name = "subscriptions")
 public class Subscription {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/org/openpodcastapi/opa/subscription/model/UserSubscription.java

@@ -1,17 +1,16 @@
 package org.openpodcastapi.opa.subscription.model;
 
 import jakarta.persistence.*;
-import lombok.Generated;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 import org.openpodcastapi.opa.user.model.User;
 
 import java.time.Instant;
 import java.util.UUID;
 
 @Entity
 @NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Table(name = "user_subscription")
 public class UserSubscription {
     @Id

src/test/java/org/openpodcastapi/opa/subscriptions/UserSubscriptionMapperTest.java

@@ -0,0 +1,70 @@
+package org.openpodcastapi.opa.subscriptions;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.openpodcastapi.opa.subscription.dto.UserSubscriptionDto;
+import org.openpodcastapi.opa.subscription.mapper.UserSubscriptionMapper;
+import org.openpodcastapi.opa.subscription.mapper.UserSubscriptionMapperImpl;
+import org.openpodcastapi.opa.subscription.model.Subscription;
+import org.openpodcastapi.opa.subscription.model.UserSubscription;
+import org.openpodcastapi.opa.subscription.repository.UserSubscriptionRepository;
+import org.openpodcastapi.opa.user.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.time.Instant;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = UserSubscriptionMapperImpl.class)
+class UserSubscriptionMapperTest {
+    @Autowired
+    private UserSubscriptionMapper mapper;
+
+    @MockitoBean
+    private UserSubscriptionRepository userSubscriptionRepository;
+
+    /// Tests that a [UserSubscription] entity maps to a [UserSubscriptionDto] representation
+    @Test
+    void testToDto() {
+        final Instant timestamp = Instant.now();
+        final UUID uuid = UUID.randomUUID();
+        User user = User.builder()
+                .uuid(UUID.randomUUID())
+                .username("test")
+                .email("test@test.test")
+                .createdAt(timestamp)
+                .updatedAt(timestamp)
+                .build();
+
+        Subscription subscription = Subscription.builder()
+                .uuid(UUID.randomUUID())
+                .feedUrl("test.com/feed1")
+                .createdAt(timestamp)
+                .updatedAt(timestamp)
+                .build();
+
+        UserSubscription userSubscription = UserSubscription.builder()
+                .uuid(uuid)
+                .user(user)
+                .subscription(subscription)
+                .isSubscribed(true)
+                .createdAt(timestamp)
+                .updatedAt(timestamp)
+                .build();
+
+        UserSubscriptionDto dto = mapper.toDto(userSubscription);
+        assertNotNull(dto);
+
+        // The DTO should inherit the feed URL from the Subscription
+        assertEquals(subscription.getFeedUrl(), dto.feedUrl());
+
+        // The DTO should use the Subscription's UUID rather than the UserSubscription's
+        assertEquals(subscription.getUuid(), dto.uuid());
+        assertTrue(dto.isSubscribed());
+    }
+}

src/test/java/org/openpodcastapi/opa/user/UserMapperSpringTest.java

@@ -1,25 +1,33 @@
 package org.openpodcastapi.opa.user;
 
 import org.junit.jupiter.api.Test;
-import org.mapstruct.factory.Mappers;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.openpodcastapi.opa.user.dto.CreateUserDto;
+import org.openpodcastapi.opa.user.dto.UserDto;
 import org.openpodcastapi.opa.user.mapper.UserMapper;
+import org.openpodcastapi.opa.user.mapper.UserMapperImpl;
 import org.openpodcastapi.opa.user.model.User;
 import org.openpodcastapi.opa.user.repository.UserRepository;
-import org.openpodcastapi.opa.user.dto.UserDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.Instant;
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = UserMapperImpl.class)
 class UserMapperSpringTest {
-    private final UserMapper mapper = Mappers.getMapper(UserMapper.class);
+    @Autowired
+    private UserMapper mapper;
 
     @MockitoBean
     private UserRepository userRepository;
 
+    /// Tests that a [User] entity maps to a [UserDto] representation
     @Test
     void testToDto() {
         final Instant timestamp = Instant.now();
@@ -41,6 +49,7 @@ void testToDto() {
         assertEquals(user.getUpdatedAt(), dto.updatedAt());
     }
 
+    /// Tests that a [CreateUserDto] maps to a [User] entity
     @Test
     void testToEntity() {
         CreateUserDto dto = new CreateUserDto("test", "testPassword", "test@test.test");