[FEAT] 연락처 불러오기 & 주기 설정 기능 #40
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package com.alarmy.near.data.mapper | ||
|
|
||
| import com.alarmy.near.model.Anniversary | ||
| import com.alarmy.near.model.ContactFrequency | ||
| import com.alarmy.near.model.DayOfWeek | ||
| import com.alarmy.near.model.Friend | ||
| import com.alarmy.near.model.Relation | ||
| import com.alarmy.near.model.ReminderInterval | ||
| import com.alarmy.near.network.request.ContactFrequencyInitRequest | ||
| import com.alarmy.near.network.request.FriendInitItemRequest | ||
| import com.alarmy.near.network.response.AnniversaryInitEntity | ||
| import com.alarmy.near.network.response.ContactFrequencyInitEntity | ||
| import com.alarmy.near.network.response.FriendInitItemEntity | ||
| import com.alarmy.near.presentation.feature.friendcontactcycle.model.FriendContactUIModel | ||
| import com.alarmy.near.utils.extensions.DateExtension | ||
|
|
||
| /** | ||
| * 010 전화번호를 010-0000-0000 형태로 포맷팅하는 함수 | ||
| * - //010-0000-0000 으로 앞에 //가 붙는 경우 | ||
| * - 01012341234로 하이픈이 없는 경우 | ||
| * 최종적으로 010-0000-0000 형태로 변환합니다. | ||
| */ | ||
| private fun String.formatPhoneNumber(): String { | ||
| // 1. 불필요한 문자들 제거 | ||
| val cleaned = | ||
| this | ||
| .replace("//", "") // // 제거 | ||
| .replace("-", "") // 하이픈 제거 (하이픈이 없는 경우 위치값으로 넣어줘야 하기때문에 우선 제거) | ||
| .replace(" ", "") // 공백 제거 | ||
| .trim() | ||
|
|
||
| // 2. 000-0000-0000 형태로 포맷팅 | ||
| return "${cleaned.substring(0, 3)}-${cleaned.substring(3, 7)}-${cleaned.substring(7)}" | ||
| } | ||
|
||
|
|
||
| /** | ||
| * UI 모델을 서버 요청 모델로 변환 | ||
| */ | ||
| fun FriendContactUIModel.toFriendInitItemRequest(providerType: String): FriendInitItemRequest = | ||
| FriendInitItemRequest( | ||
| name = name, | ||
| phone = phones.first().formatPhoneNumber(), | ||
|
||
| memo = memo, | ||
| birthDay = birthDay, | ||
| source = providerType, | ||
| contactFrequency = createContactFrequencyRequest(reminderInterval!!), | ||
| imageUploadRequest = null, | ||
| anniversary = null, | ||
| relation = "FRIEND", // 기본값으로 FRIEND 설정 | ||
| ) | ||
|
|
||
| /** | ||
| * ContactFrequencyInitEntity를 모델로 변환 | ||
| */ | ||
| fun ContactFrequencyInitEntity.toModel(): ContactFrequency = | ||
| ContactFrequency( | ||
| reminderInterval = ReminderInterval.valueOf(contactWeek), | ||
| dayOfWeek = DayOfWeek.valueOf(dayOfWeek), | ||
| ) | ||
|
Comment on lines
46
to
50
There was a problem hiding this comment. 서버에서 예상치 못한 fun ContactFrequencyInitEntity.toModel(): ContactFrequency =
ContactFrequency(
reminderInterval = runCatching { ReminderInterval.valueOf(contactWeek) }.getOrDefault(ReminderInterval.EVERY_WEEK),
dayOfWeek = runCatching { DayOfWeek.valueOf(dayOfWeek) }.getOrDefault(DayOfWeek.MONDAY),
) |
||
|
|
||
| /** | ||
| * AnniversaryInitEntity를 모델로 변환 | ||
| */ | ||
| fun AnniversaryInitEntity.toModel(): Anniversary = | ||
| Anniversary( | ||
| id = id, | ||
| title = title, | ||
| date = date, | ||
| ) | ||
|
|
||
| /** | ||
| * 서버 응답을 모델로 변환 | ||
| */ | ||
| fun FriendInitItemEntity.toModel(): Friend = | ||
| Friend( | ||
| friendId = friendId, | ||
| name = name, | ||
| phone = phone, | ||
| memo = memo, | ||
| birthday = null, | ||
| imageUrl = preSignedImageUrl, | ||
| relation = Relation.valueOf(source), | ||
stopstone marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| contactFrequency = contactFrequency.toModel(), | ||
| anniversaryList = anniversary?.let { listOf(it.toModel()) } ?: emptyList(), | ||
| lastContactAt = nextContactAt, | ||
| ) | ||
|
|
||
| /** | ||
| * ReminderInterval을 ContactFrequencyInitRequest로 변환 | ||
| */ | ||
| private fun createContactFrequencyRequest(reminderInterval: ReminderInterval): ContactFrequencyInitRequest = | ||
| ContactFrequencyInitRequest( | ||
| contactWeek = DateExtension.toContactWeekString(reminderInterval), | ||
| dayOfWeek = DateExtension.getTodayDayOfWeekInEnglish(), | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package com.alarmy.near.network.request | ||
|
|
||
| import kotlinx.serialization.Serializable | ||
|
|
||
| /** | ||
| * 친구 초기 설정 API 요청 데이터 모델 | ||
| */ | ||
| @Serializable | ||
| data class FriendInitRequest( | ||
| val friendList: List<FriendInitItemRequest>, | ||
| ) | ||
|
|
||
| /** | ||
| * 친구 초기 설정 개별 아이템 요청 데이터 모델 | ||
| */ | ||
| @Serializable | ||
| data class FriendInitItemRequest( | ||
| val name: String, | ||
| val phone: String, | ||
| val memo: String? = null, | ||
| val birthDay: String? = null, | ||
| val source: String, | ||
| val contactFrequency: ContactFrequencyInitRequest, | ||
| val imageUploadRequest: ImageUploadRequest? = null, | ||
| val anniversary: AnniversaryInitRequest? = null, | ||
| val relation: String? = null, | ||
| ) | ||
|
|
||
| /** | ||
| * 연락처 주기 설정 요청 데이터 모델 | ||
| */ | ||
| @Serializable | ||
| data class ContactFrequencyInitRequest( | ||
| val contactWeek: String, // EVERY_WEEK, EVERY_TWO_WEEKS, EVERY_MONTH | ||
| val dayOfWeek: String, // MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY | ||
| ) | ||
|
|
||
| /** | ||
| * 이미지 업로드 요청 데이터 모델 | ||
| */ | ||
| @Serializable | ||
| data class ImageUploadRequest( | ||
| val fileName: String? = null, | ||
| val contentType: String? = null, | ||
| val fileSize: Int? = null, | ||
| val category: String? = null, | ||
| ) | ||
|
|
||
| /** | ||
| * 기념일 요청 데이터 모델 | ||
| */ | ||
| @Serializable | ||
| data class AnniversaryInitRequest( | ||
| val title: String, | ||
| val date: String? = null, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.alarmy.near.network.response | ||
|
|
||
| import kotlinx.serialization.Serializable | ||
|
|
||
| /** | ||
| * 친구 초기 설정 API 응답 데이터 | ||
| */ | ||
| @Serializable | ||
| data class FriendInitEntity( | ||
| val friendList: List<FriendInitItemEntity>, | ||
| ) | ||
|
|
||
| @Serializable | ||
| data class FriendInitItemEntity( | ||
| val friendId: String, | ||
| val name: String, | ||
| val source: String, | ||
| val contactFrequency: ContactFrequencyInitEntity, | ||
| val nextContactAt: String, | ||
| val phone: String, | ||
| val preSignedImageUrl: String? = null, | ||
| val fileName: String? = null, | ||
| val memo: String? = null, | ||
| val anniversary: AnniversaryInitEntity? = null, | ||
| ) | ||
|
|
||
| @Serializable | ||
| data class ContactFrequencyInitEntity( | ||
| val contactWeek: String, | ||
| val dayOfWeek: String, | ||
| ) | ||
|
|
||
| @Serializable | ||
| data class AnniversaryInitEntity( | ||
| val id: Int, | ||
| val title: String, | ||
| val date: String, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stopstone // 혹시 02, 031같은 010으로 시작하지 않는 번호로 들어올 땐 어떻게 되나요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
휴대전화 형식으로만 변환하게 두었습니다..!
지역번호 같은 경우 000-0000-0000, 000-000-0000와 같이 형식이 다양해서 어떻게 수정을 해야할지 좀 더 고민을 해봐야 할 것 같습니다
작업하면서 제 연락처에 있는 케이스 (//010~, 하이픈X, 하이픈O)만 우선 처리하였습니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stopstone // libphonenumber을 쓰면 안될까요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@slg1119 앗 감사합니다 한번 시도해보겠습니다 될 거 같아요!
android에서 사용하려면 공식 포트는 아니라서 verySlow 라고 되어있긴 한데 큰 문제는 없을 것 같습니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stopstone // 감사합니다 😁
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@slg1119 유용한 라이브러리 추천 감사합니다 :)