Fixing tests failing after changes

NIAEFEUP · Mar 29, 2024 · 250bb18 · 250bb18
1 parent 1863c6f
commit 250bb18
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/main/kotlin/pt/up/fe/ni/website/backend/model/Activity.kt b/src/main/kotlin/pt/up/fe/ni/website/backend/model/Activity.kt
@@ -44,7 +44,7 @@ abstract class Activity(
     @field:NotBlank
     open var image: String,
 
-    @ElementCollection
+    @ElementCollection(fetch = FetchType.EAGER)
     open val gallery: MutableList<String> = mutableListOf(),
 
     @Id

diff --git a/src/main/kotlin/pt/up/fe/ni/website/backend/service/activity/AbstractActivityService.kt b/src/main/kotlin/pt/up/fe/ni/website/backend/service/activity/AbstractActivityService.kt
@@ -90,9 +90,10 @@ abstract class AbstractActivityService<T : Activity>(
 
         var imageFolder = "activities"
 
-        when (activity::javaClass) {
-            Event::class -> imageFolder = EventService.IMAGE_FOLDER
-            Project::class -> imageFolder = ProjectService.IMAGE_FOLDER
+        if (activity is Event) {
+            imageFolder = EventService.IMAGE_FOLDER
+        } else if (activity is Project) {
+            imageFolder = ProjectService.IMAGE_FOLDER
         }
 
         val fileName = fileUploader.buildFileName(image, activity.title)

diff --git a/src/test/kotlin/pt/up/fe/ni/website/backend/controller/EventControllerTest.kt b/src/test/kotlin/pt/up/fe/ni/website/backend/controller/EventControllerTest.kt
@@ -837,7 +837,7 @@ internal class EventControllerTest @Autowired constructor(
 
         @Test
         fun `should add an image`() {
-            val expectedImagePath = "${uploadConfigProperties.staticServe}/gallery/${testEvent.title}-$uuid.jpeg"
+            val expectedImagePath = "${uploadConfigProperties.staticServe}/events/gallery/${testEvent.title}-$uuid.jpeg"
 
             mockMvc.multipartBuilder("/events/${testEvent.id}/gallery/addImage")
                 .asPutMethod()
@@ -898,11 +898,13 @@ internal class EventControllerTest @Autowired constructor(
 
         private val uuid: UUID = UUID.randomUUID()
         private val mockedSettings = Mockito.mockStatic(UUID::class.java)
-        private val mockImageUrl = "${uploadConfigProperties.staticServe}/gallery/${testEvent.title}-$uuid.jpeg"
+        private val mockImageUrl = "${uploadConfigProperties.staticServe}/events/gallery/${testEvent.title}-$uuid.jpeg"
 
         @BeforeAll
         fun setupMocks() {
             Mockito.`when`(UUID.randomUUID()).thenReturn(uuid)
+
+            testEvent.gallery.add(mockImageUrl)
         }
 
         @AfterAll
@@ -914,10 +916,7 @@ internal class EventControllerTest @Autowired constructor(
         fun addToRepositories() {
             accountRepository.save(testAccount)
 
-            val testEventClone = testEvent
-
-            testEvent.gallery.add(mockImageUrl)
-            repository.save(testEventClone)
+            repository.save(testEvent)
         }
 
         @Test