From 02655f7d187c3d127cb377b920ed839f58f641eb Mon Sep 17 00:00:00 2001
From: savsch <unholyexterminator@gmail.com>
Date: Wed, 15 Jan 2025 22:55:21 +0530
Subject: [PATCH] Corrected DepictedItem constructor arguments

---
 .../upload/structure/depictions/DepictedItem.kt        | 10 ++++++----
 .../test/kotlin/fr/free/nrw/commons/ModelFunctions.kt  |  4 ++--
 .../free/nrw/commons/category/CategoriesModelTest.kt   |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt
index 5f9bf4cfb..4ae366535 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt
@@ -29,7 +29,7 @@ const val THUMB_IMAGE_SIZE = "70px"
 data class DepictedItem constructor(
     override val name: String,
     val description: String?,
-    val primaryImage: String?,
+    val imageUrl: String?,
     val instanceOfs: List<String>,
     val commonsCategories: List<CategoryItem>,
     var isSelected: Boolean,
@@ -51,7 +51,9 @@ data class DepictedItem constructor(
     constructor(entity: Entities.Entity, name: String, description: String) : this(
         name,
         description,
-        entity[IMAGE].primaryImageValue?.value,
+        entity[IMAGE].primaryImageValue?.let {
+            getImageUrl(it.value, THUMB_IMAGE_SIZE)
+        },
         entity[INSTANCE_OF].toIds(),
         entity[COMMONS_CATEGORY]?.map {
             CategoryItem(
@@ -66,8 +68,8 @@ data class DepictedItem constructor(
         entity.id(),
     )
 
-    val imageUrl: String?
-        get() = primaryImage?.let { getImageUrl(it, THUMB_IMAGE_SIZE) }
+    val primaryImage: String?
+        get() = imageUrl?.split('-')?.lastOrNull()
 
     override fun equals(other: Any?) =
         when {
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt b/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt
index 816eb53c1..76f9c21d0 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt
@@ -18,7 +18,7 @@ import java.util.Date
 fun depictedItem(
     name: String = "label",
     description: String = "desc",
-    primaryImage: String = "",
+    imageUrl: String = "",
     instanceOfs: List<String> = listOf(),
     commonsCategories: List<CategoryItem> = listOf(),
     isSelected: Boolean = false,
@@ -26,7 +26,7 @@ fun depictedItem(
 ) = DepictedItem(
     name = name,
     description = description,
-    primaryImage = primaryImage,
+    imageUrl = imageUrl,
     instanceOfs = instanceOfs,
     commonsCategories = commonsCategories,
     isSelected = isSelected,
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt
index 69d5ee7a3..8c336470a 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt
@@ -103,7 +103,7 @@ class CategoriesModelTest {
             )
         val depictedItemWithoutCategories =
             depictedItem(
-                primaryImage = "P18"
+                imageUrl = "testUrl"
             )
 
         whenever(gpsCategoryModel.categoriesFromLocation)
@@ -167,7 +167,7 @@ class CategoriesModelTest {
         )
         whenever(
             categoryClient.getCategoriesOfImage(
-                "P18",
+                "testUrl",
                 25,
             ),
         ).thenReturn(