[Campus][Feature] 분실물 게시글 수정 기능 구현

core/analytics/src/main/java/in/koreatech/koin/core/analytics/AnalyticsConstant.kt

@@ -129,6 +129,15 @@ object AnalyticsConstant {
             const val ITEM_MESSAGE_SEND = "item_message_send"
             const val ITEM_POST_REPORT = "item_post_report"
             const val ITEM_POST_TYPE = "item_post_type"
+            const val LOST_ITEM_FILTER = "lost_item_filter"
+            const val LOST_ITEM_FILTER_APPLY = "lost_item_filter_apply"
+            const val LOST_ITEM_POST_ENTRY = "lost_item_post_entry"
+            const val LOST_ITEM_MESSAGE_LOGIN_REQUEST = "lost_item_message_login_request"
+            const val LOST_ITEM_WRITE_LOGIN_REQUEST = "lost_item_write_login_request"
+            const val LOST_ITEM_STATE_CHANGE = "lost_item_state_change"
+            const val LOST_ITEM_FOUND = "lost_item_found"
+            const val LOST_ITEM_MODIFY = "lost_item_modify"
+            const val LOST_ITEM_MODIFY_COMPLETE = "lost_item_modify_complete"
         }
 
         object CHAT {

data/src/main/java/in/koreatech/koin/data/api/ArticleApi.kt

@@ -78,8 +78,8 @@ interface ArticleApi {
      * 분실물 게시글 조회
      * @param id 게시글 아이디
      */
-    @GET("articles/lost-item/{id}")
-    suspend fun fetchArticleLostAndFound(
+    @GET("articles/lost-item/v2/{id}")
+    suspend fun fetchArticleLostAndFoundV2(
         @Path("id") id: Int
     ): ArticleLostAndFoundResponse
 

data/src/main/java/in/koreatech/koin/data/repository/ArticleRepositoryImpl.kt

@@ -261,10 +261,10 @@ class ArticleRepositoryImpl @Inject constructor(
         }
     }
 
-    override fun fetchArticleLostAndFound(articleId: Int): Flow<ArticleLostAndFound> {
+    override fun fetchArticleLostAndFoundV2(articleId: Int): Flow<ArticleLostAndFound> {
         return flow {
             emit(
-                articleRemoteDataSource.fetchArticleLostAndFound(articleId).toArticleLostAndFound()
+                articleRemoteDataSource.fetchArticleLostAndFoundV2(articleId).toArticleLostAndFound()
             )
         }
     }
@@ -326,7 +326,7 @@ class ArticleRepositoryImpl @Inject constructor(
         foundDate: String,
         content: String?,
         newImage: List<String>?,
-        deleteImageIds: List<String>?
+        deleteImageIds: List<Int>?
     ): Result<Unit> {
         return runCatching {
             val response = articleRemoteDataSource.modifyArticleLostAndFound(

data/src/main/java/in/koreatech/koin/data/request/article/ArticleModifyRequest.kt

@@ -7,6 +7,6 @@ data class ArticleModifyRequest(
     @SerializedName("found_place") val foundPlace: String,
     @SerializedName("found_date") val foundDate: String,
     @SerializedName("content") val content: String?,
-    @SerializedName("new_image") val newImage: List<String>?,
-    @SerializedName("delete_image_ids") val deleteImageIds: List<String>?
+    @SerializedName("new_images") val newImage: List<String>?,
+    @SerializedName("delete_image_ids") val deleteImageIds: List<Int>?
 )

data/src/main/java/in/koreatech/koin/data/response/article/ArticleLostAndFoundResponse.kt

@@ -13,7 +13,7 @@ data class ArticleLostAndFoundResponse(
     @SerializedName("found_date") val foundDate: String,
     @SerializedName("content") val content: String?,
     @SerializedName("author") val author: String,
-    @SerializedName("is_council") val isCouncil: Boolean?, // Set nullable because /articles/lost-item API doesn't have this field
+    @SerializedName("organization") val organization: ArticleLostAndFoundOrganizationResponse?,
     @SerializedName("is_mine") val isMine: Boolean?, // Set nullable because /articles/lost-item API doesn't have this field
     @SerializedName("is_reported") val isReported: Boolean,
     @SerializedName("is_found") val isFound: Boolean,
@@ -34,6 +34,17 @@ data class ArticleLostAndFoundResponse(
             )
     }
 
+    data class ArticleLostAndFoundOrganizationResponse(
+        @SerializedName("name") val name: String,
+        @SerializedName("location") val location: String
+    ) {
+        fun toArticleLostAndFoundOrganization() =
+            ArticleLostAndFound.ArticleLostAndFoundOrganization(
+                name = name,
+                location = location
+            )
+    }
+
     fun toArticleLostAndFoundHeader() =
         ArticleLostAndFoundHeader(
             id = id,
@@ -65,7 +76,7 @@ data class ArticleLostAndFoundResponse(
             foundDate = foundDate,
             content = content,
             author = author,
-            isCouncil = isCouncil!!, // Should not be null
+            organization = organization?.toArticleLostAndFoundOrganization(),
             isMine = isMine!!, // Should not be null
             isFound = isFound,
             images = images?.map { it.toArticleLostAndFoundImage() },

data/src/main/java/in/koreatech/koin/data/source/remote/ArticleRemoteDataSource.kt

@@ -111,8 +111,8 @@ class ArticleRemoteDataSource @Inject constructor(
         return articleApi.fetchSearchedLostAndFoundArticles(query, page, limit)
     }
 
-    suspend fun fetchArticleLostAndFound(articleId: Int): ArticleLostAndFoundResponse {
-        return articleApi.fetchArticleLostAndFound(articleId)
+    suspend fun fetchArticleLostAndFoundV2(articleId: Int): ArticleLostAndFoundResponse {
+        return articleApi.fetchArticleLostAndFoundV2(articleId)
     }
 
     suspend fun uploadArticleLostAndFound(articleLostAndFound: List<ArticleLostAndFoundUpload>): Result<ArticleLostAndFoundResponse> {

domain/src/main/java/in/koreatech/koin/domain/model/article/ArticleLostAndFound.kt

@@ -9,7 +9,7 @@ data class ArticleLostAndFound(
     val foundDate: String,
     val content: String?,
     val author: String,
-    val isCouncil: Boolean,
+    val organization: ArticleLostAndFoundOrganization?,
     val isMine: Boolean,
     val isFound: Boolean,
     val images: List<ArticleLostAndFoundImage>?,
@@ -20,4 +20,9 @@ data class ArticleLostAndFound(
         val id: Int,
         val imageUrl: String
     )
+
+    data class ArticleLostAndFoundOrganization(
+        val name: String,
+        val location: String
+    )
 }

domain/src/main/java/in/koreatech/koin/domain/repository/ArticleRepository.kt

@@ -74,7 +74,7 @@ interface ArticleRepository {
         limit: Int
     ): Flow<ArticleLostAndFoundPagination>
 
-    fun fetchArticleLostAndFound(articleId: Int): Flow<ArticleLostAndFound>
+    fun fetchArticleLostAndFoundV2(articleId: Int): Flow<ArticleLostAndFound>
 
     suspend fun uploadArticleLostAndFound(articleLostAndFoundList: List<ArticleLostAndFoundUpload>): Result<ArticleLostAndFound>
 
@@ -96,6 +96,6 @@ interface ArticleRepository {
         foundDate: String,
         content: String?,
         newImage: List<String>?,
-        deleteImageIds: List<String>?
+        deleteImageIds: List<Int>?
     ): Result<Unit>
 }

domain/src/main/java/in/koreatech/koin/domain/usecase/article/lostandfound/FetchLostAndFoundArticleUseCase.kt → domain/src/main/java/in/koreatech/koin/domain/usecase/article/lostandfound/FetchLostAndFoundArticleV2UseCase.kt

@@ -5,8 +5,8 @@ import `in`.koreatech.koin.domain.repository.ArticleRepository
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 
-class FetchLostAndFoundArticleUseCase @Inject constructor(
+class FetchLostAndFoundArticleV2UseCase @Inject constructor(
     private val articleRepository: ArticleRepository
 ) {
-    operator fun invoke(articleId: Int): Flow<ArticleLostAndFound> = articleRepository.fetchArticleLostAndFound(articleId)
+    operator fun invoke(articleId: Int): Flow<ArticleLostAndFound> = articleRepository.fetchArticleLostAndFoundV2(articleId)
 }

domain/src/main/java/in/koreatech/koin/domain/usecase/article/lostandfound/ModifyArticleLostAndFoundUseCase.kt

@@ -13,7 +13,7 @@ class ModifyArticleLostAndFoundUseCase @Inject constructor(
         foundDate: String,
         content: String?,
         newImage: List<String>?,
-        deleteImageIds: List<String>?
+        deleteImageIds: List<Int>?
     ): Result<Unit> {
         return articleRepository.modifyArticleLostAndFound(
             articleId,

feature/article/src/main/AndroidManifest.xml

@@ -19,11 +19,6 @@
                     android:scheme="koin" />
             </intent-filter>
         </activity>
-
-        <activity
-            android:name=".LostAndFoundReportActivity"
-            android:exported="true"
-            android:windowSoftInputMode="adjustResize" />
     </application>
 
 </manifest>

feature/lostandfound/src/main/AndroidManifest.xml

@@ -4,8 +4,20 @@
     <application>
         <activity
             android:name=".ui.LostAndFoundActivity"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize" />
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="articles"
+                    android:pathPrefix="/lost-item/activity"
+                    android:scheme="koin" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/RedirectUrl.kt

@@ -0,0 +1,3 @@
+package `in`.koreatech.koin.feature.lostandfound
+
+const val DEEP_LINK_LOST_AND_FOUND_BASE = "koin://articles/lost-item/activity"

feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/ui/write/component/WriteArticleDoneButton.kt → feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/component/EditArticleDoneButton.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.feature.lostandfound.ui.write.component
+package `in`.koreatech.koin.feature.lostandfound.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -18,12 +18,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
-import `in`.koreatech.koin.feature.lostandfound.R
 
-object WriteArticleDoneButtonDefaults {
+object EditArticleDoneButtonDefaults {
     val windowInsets: WindowInsets
         @Composable
         get() = WindowInsets.systemBars.only(
@@ -32,9 +30,10 @@ object WriteArticleDoneButtonDefaults {
 }
 
 @Composable
-fun WriteArticleDoneButton(
+fun EditArticleDoneButton(
+    text: String,
     modifier: Modifier = Modifier,
-    windowInsets: WindowInsets = WriteArticleDoneButtonDefaults.windowInsets,
+    windowInsets: WindowInsets = EditArticleDoneButtonDefaults.windowInsets,
     onClick: () -> Unit = {}
 ) = Column(
     modifier = modifier.windowInsetsPadding(windowInsets),
@@ -63,7 +62,7 @@ fun WriteArticleDoneButton(
         ) {
             Text(
                 style = KoinTheme.typography.bold15,
-                text = stringResource(id = R.string.write_done)
+                text = text
             )
         }
     }

feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/ui/write/component/WriteArticleHeader.kt → feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/component/EditArticleHeader.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.feature.lostandfound.ui.write.component
+package `in`.koreatech.koin.feature.lostandfound.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -25,7 +25,7 @@ import `in`.koreatech.koin.feature.lostandfound.R
 import `in`.koreatech.koin.feature.lostandfound.enums.LostOrFoundType
 
 @Composable
-fun WriteArticleHeader(
+fun EditArticleHeader(
     type: LostOrFoundType,
     modifier: Modifier = Modifier
 ) {

feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/ui/write/component/WriteArticleItemDetail.kt → feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/component/EditArticleItemDetail.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.feature.lostandfound.ui.write.component
+package `in`.koreatech.koin.feature.lostandfound.component
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.Image
@@ -49,7 +49,7 @@ import `in`.koreatech.koin.feature.lostandfound.enums.LostOrFoundType
 import java.time.LocalDate
 
 @Composable
-fun WriteArticleItemDetail(
+fun EditArticleItemDetail(
     modifier: Modifier = Modifier,
     type: LostOrFoundType,
     location: String,
@@ -364,7 +364,7 @@ fun WriteArticleItemDetail(
 
     Spacer(modifier = Modifier.height(8.dp))
 
-    WriteArticleTextField(
+    EditArticleTextField(
         value = location,
         onValueChange = onLocationChange,
         singleLine = true,
@@ -401,7 +401,7 @@ fun WriteArticleItemDetail(
 
     Spacer(modifier = Modifier.height(8.dp))
 
-    WriteArticleTextField(
+    EditArticleTextField(
         value = moreDescription,
         onValueChange = {
             if (moreDescription.length < DESCRIPTION_MAX_LENGTH) {

feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/ui/write/component/WriteArticleItemType.kt → feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/component/EditArticleItemType.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.feature.lostandfound.ui.write.component
+package `in`.koreatech.koin.feature.lostandfound.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -21,12 +21,11 @@ import androidx.compose.ui.unit.dp
 import `in`.koreatech.koin.core.designsystem.component.text.LeadingIconText
 import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
 import `in`.koreatech.koin.feature.lostandfound.R
-import `in`.koreatech.koin.feature.lostandfound.component.ItemTypeChip
 import `in`.koreatech.koin.feature.lostandfound.enums.LostItemCategory
 import kotlinx.collections.immutable.toImmutableList
 
 @Composable
-fun WriteArticleItemType(
+fun EditArticleItemType(
     selectedChipIndex: Int,
     modifier: Modifier = Modifier,
     itemTypeRequired: Boolean = false,

feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/ui/write/component/WriteArticleTextField.kt → feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/component/EditArticleTextField.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.feature.lostandfound.ui.write.component
+package `in`.koreatech.koin.feature.lostandfound.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -12,7 +12,7 @@ import androidx.compose.ui.unit.dp
 import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
 
 @Composable
-fun WriteArticleTextField(
+fun EditArticleTextField(
     value: String,
     hint: String,
     modifier: Modifier = Modifier,

feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/ui/write/component/WriteArticleUploadImage.kt → feature/lostandfound/src/main/java/in/koreatech/koin/feature/lostandfound/component/EditArticleUploadImage.kt

@@ -1,4 +1,4 @@
-package `in`.koreatech.koin.feature.lostandfound.ui.write.component
+package `in`.koreatech.koin.feature.lostandfound.component
 
 import android.net.Uri
 import androidx.compose.foundation.Image
@@ -49,7 +49,7 @@ import `in`.koreatech.koin.feature.lostandfound.R
 import `in`.koreatech.koin.feature.lostandfound.enums.LostOrFoundType
 
 @Composable
-fun WriteArticleUploadImage(
+fun EditArticleUploadImage(
     type: LostOrFoundType,
     uploadedImageCount: Int = 0,
     imageList: List<String> = listOf(),
@@ -98,7 +98,7 @@ fun WriteArticleUploadImage(
                 horizontalArrangement = Arrangement.spacedBy(8.dp)
             ) {
                 itemsIndexed(imageList) { index, imageUrl ->
-                    WriteArticleUploadImageThumbnail(
+                    EditArticleUploadImageThumbnail(
                         index = index,
                         imageUrl = Uri.parse(imageUrl)
                     ) {
@@ -138,7 +138,7 @@ fun WriteArticleUploadImage(
 }
 
 @Composable
-fun WriteArticleUploadImageThumbnail(
+fun EditArticleUploadImageThumbnail(
     index: Int,
     imageUrl: Uri,
     modifier: Modifier = Modifier,