From a9c45a7e31bd4b08c83b4fd1369c9de09103118f Mon Sep 17 00:00:00 2001 From: ellieeekk Date: Sun, 17 Nov 2024 23:14:34 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20report=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reconnect/data/model/report/MissingPersonListResponse.kt | 2 +- .../main/java/com/mobile/reconnect/data/network/ApiService.kt | 1 - .../java/com/mobile/reconnect/data/network/NetworkClient.kt | 1 - .../reconnect/data/network/api/report/MissingPersonApi.kt | 1 + .../com/mobile/reconnect/data/network/api/report/ReportApi.kt | 1 + .../mobile/reconnect/data/repository/MissingPersonRepository.kt | 1 - .../com/mobile/reconnect/data/repository/ReportRepository.kt | 1 - .../java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt | 1 - .../main/java/com/mobile/reconnect/ui/report/ReportFragment.kt | 1 - .../mobile/reconnect/ui/report/ReportRegistrationFragment.kt | 1 - .../mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt | 1 - .../reconnect/ui/report/viewmodel/MissingPersonViewModel.kt | 1 - .../ui/report/viewmodel/ReportRegistrationViewModel.kt | 1 - app/src/main/res/layout/fragment_report.xml | 1 - app/src/main/res/layout/fragment_report_detail.xml | 1 - app/src/main/res/layout/fragment_report_registration.xml | 1 - app/src/main/res/layout/item_missing_person.xml | 1 - app/src/main/res/layout/item_report_missing_person.xml | 1 - 18 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonListResponse.kt b/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonListResponse.kt index 4557e62..662d1e9 100644 --- a/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonListResponse.kt +++ b/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonListResponse.kt @@ -36,6 +36,6 @@ data class MissingPersonListResponse( "DEMENTIA" -> "치매" "RUNAWAY" -> "가출인" "OTHER" -> "기타" - else -> "알 수 없음" + else -> "알 수 없음" // } } \ No newline at end of file diff --git a/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt b/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt index e43febd..57d6b90 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt @@ -9,7 +9,6 @@ import retrofit2.http.POST import retrofit2.http.Path interface ApiService { - @POST("/reports") suspend fun createReport(@Body reportRequest: ReportRequest): Response diff --git a/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt b/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt index 5cce8b1..429f6ef 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt @@ -63,5 +63,4 @@ object NetworkClient { return retrofit.create(ReportApi::class.java) } - } diff --git a/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt b/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt index 4e14628..81c1c80 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt @@ -7,6 +7,7 @@ import retrofit2.http.GET import retrofit2.http.Path import retrofit2.http.Query +// api interface MissingPersonApi { @GET("/api/missing_person") suspend fun getMissingPersons( diff --git a/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt b/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt index b638eb4..5896ba0 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt @@ -6,6 +6,7 @@ import com.mobile.reconnect.data.network.ApiService import retrofit2.Response import javax.inject.Inject +// api class ReportApi @Inject constructor(private val apiService: ApiService) { suspend fun createReport(reportRequest: ReportRequest): Response { diff --git a/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt b/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt index 7645b45..8f61c4b 100644 --- a/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt +++ b/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt @@ -14,7 +14,6 @@ class MissingPersonRepository @Inject constructor( suspend fun getMissingPersons(sortBy: String, latitude: Double, longitude: Double): List { return missingPersonApi.getMissingPersons(sortBy, latitude, longitude) } - suspend fun getMissingPersonDetails(id: Long): MissingPersonDetailResponse { return missingPersonApi.getMissingPersonDetails(id) } diff --git a/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt b/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt index 0bdb928..755b549 100644 --- a/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt +++ b/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt @@ -15,7 +15,6 @@ class ReportRepository @Inject constructor(private val api: ReportApi) { null // 네트워크 에러 처리 } } - suspend fun updateGender(missingPersonId: Long, gender: com.mobile.reconnect.data.model.ReportGender): Response? { return try { api.updateGender(missingPersonId, gender) diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt b/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt index 19cf237..d3c3b91 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt @@ -47,7 +47,6 @@ class ReportDetailFragment : BaseFragment(R.layout. findNavController().navigate(R.id.action_reportDetailFragment_to_reportRegistrationFragment, bundle) } } - private fun setupObservers() { // 실종자 상세 정보 관찰 viewModel.missingPersonDetail.observe(viewLifecycleOwner) { detail -> diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt b/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt index 7506dea..bfe074b 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt @@ -52,7 +52,6 @@ class ReportFragment : BaseFragment(R.layout.fragment_rep } } } - private fun setupRecyclerView() { val adapter = MissingPersonAdapter { missingPerson, view -> val bundle = Bundle().apply { diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt b/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt index 727ad6e..966e542 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt @@ -23,7 +23,6 @@ class ReportRegistrationFragment : Fragment(R.layout.fragment_report_registratio findNavController().navigate(R.id.action_reportRegistrationFragment_to_myReportFragment) } } - override fun onDestroyView() { super.onDestroyView() _binding = null diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt b/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt index 9e06bd5..419b279 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt @@ -21,7 +21,6 @@ class MissingPersonAdapter( ) return ViewHolder(binding) } - override fun onBindViewHolder(holder: ViewHolder, position: Int) { val item = getItem(position) holder.bind(item, onClick) diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt index fb6948a..78bdb92 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt @@ -54,7 +54,6 @@ class MissingPersonViewModel @Inject constructor( } } } - private fun updateCurrentTime() { viewModelScope.launch { while (true) { diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt index 3f6bb14..400b578 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt @@ -29,7 +29,6 @@ class ReportRegistrationViewModel @Inject constructor( } } } - fun updateGender( missingPersonId: Long, gender: com.mobile.reconnect.data.model.ReportGender, // 올바른 타입 diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index 8b0c800..35ac047 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -13,7 +13,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".ui.report.ReportFragment"> - -