-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from TelePigeon/feat-profile-api
[feat] Profile API 연동
- Loading branch information
Showing
25 changed files
with
435 additions
and
31 deletions.
There are no files selected for viewing
This file contains 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 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 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
18 changes: 18 additions & 0 deletions
18
...te/src/main/java/com/dongguk/telepigeon/data/remote/datasource/ProfileRemoteDataSource.kt
This file contains 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,18 @@ | ||
package com.dongguk.telepigeon.data.remote.datasource | ||
|
||
import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto | ||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto | ||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto | ||
import com.dongguk.telepigeon.data.remote.model.response.base.BaseResponseDto | ||
import com.dongguk.telepigeon.data.remote.model.response.base.NullableBaseResponseDto | ||
|
||
interface ProfileRemoteDataSource { | ||
suspend fun getRoomKeywords(roomId: Int): BaseResponseDto<ResponseGetRoomKeywordsDto> | ||
|
||
suspend fun getRoomExtra(roomId: Int): BaseResponseDto<ResponseGetRoomExtraDto> | ||
|
||
suspend fun putRoomKeywordsExtra( | ||
roomId: Int, | ||
requestPutRoomKeywordsExtraDto: RequestPutRoomKeywordsExtraDto, | ||
): NullableBaseResponseDto<Unit> | ||
} |
25 changes: 25 additions & 0 deletions
25
...ain/java/com/dongguk/telepigeon/data/remote/datasourceimpl/ProfileRemoteDataSourceImpl.kt
This file contains 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,25 @@ | ||
package com.dongguk.telepigeon.data.remote.datasourceimpl | ||
|
||
import com.dongguk.telepigeon.data.remote.datasource.ProfileRemoteDataSource | ||
import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto | ||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto | ||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto | ||
import com.dongguk.telepigeon.data.remote.model.response.base.BaseResponseDto | ||
import com.dongguk.telepigeon.data.remote.model.response.base.NullableBaseResponseDto | ||
import com.dongguk.telepigeon.data.remote.service.ProfileService | ||
import javax.inject.Inject | ||
|
||
class ProfileRemoteDataSourceImpl | ||
@Inject | ||
constructor( | ||
private val profileService: ProfileService, | ||
) : ProfileRemoteDataSource { | ||
override suspend fun getRoomKeywords(roomId: Int): BaseResponseDto<ResponseGetRoomKeywordsDto> = profileService.getRoomKeywords(roomId = roomId) | ||
|
||
override suspend fun getRoomExtra(roomId: Int): BaseResponseDto<ResponseGetRoomExtraDto> = profileService.getRoomExtra(roomId = roomId) | ||
|
||
override suspend fun putRoomKeywordsExtra( | ||
roomId: Int, | ||
requestPutRoomKeywordsExtraDto: RequestPutRoomKeywordsExtraDto, | ||
): NullableBaseResponseDto<Unit> = profileService.putRoomKeywordsExtra(roomId = roomId, requestPutRoomKeywordsExtraDto = requestPutRoomKeywordsExtraDto) | ||
} |
This file contains 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
16 changes: 16 additions & 0 deletions
16
...n/java/com/dongguk/telepigeon/data/remote/model/request/RequestPutRoomKeywordsExtraDto.kt
This file contains 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,16 @@ | ||
package com.dongguk.telepigeon.data.remote.model.request | ||
|
||
import kotlinx.serialization.SerialName | ||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
data class RequestPutRoomKeywordsExtraDto( | ||
@SerialName("keywords") | ||
val keywords: List<String>, | ||
@SerialName("gender") | ||
val gender: String, | ||
@SerialName("ageRange") | ||
val ageRange: String, | ||
@SerialName("relation") | ||
val relation: String, | ||
) |
14 changes: 14 additions & 0 deletions
14
...rc/main/java/com/dongguk/telepigeon/data/remote/model/response/ResponseGetRoomExtraDto.kt
This file contains 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,14 @@ | ||
package com.dongguk.telepigeon.data.remote.model.response | ||
|
||
import kotlinx.serialization.SerialName | ||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
data class ResponseGetRoomExtraDto( | ||
@SerialName("gender") | ||
val gender: String, | ||
@SerialName("ageRange") | ||
val ageRange: String, | ||
@SerialName("relation") | ||
val relation: String, | ||
) |
10 changes: 10 additions & 0 deletions
10
...main/java/com/dongguk/telepigeon/data/remote/model/response/ResponseGetRoomKeywordsDto.kt
This file contains 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,10 @@ | ||
package com.dongguk.telepigeon.data.remote.model.response | ||
|
||
import kotlinx.serialization.SerialName | ||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
data class ResponseGetRoomKeywordsDto( | ||
@SerialName("keywords") | ||
val keywords: List<String>, | ||
) |
36 changes: 36 additions & 0 deletions
36
data-remote/src/main/java/com/dongguk/telepigeon/data/remote/service/ProfileService.kt
This file contains 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,36 @@ | ||
package com.dongguk.telepigeon.data.remote.service | ||
|
||
import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto | ||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto | ||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto | ||
import com.dongguk.telepigeon.data.remote.model.response.base.BaseResponseDto | ||
import com.dongguk.telepigeon.data.remote.model.response.base.NullableBaseResponseDto | ||
import retrofit2.http.Body | ||
import retrofit2.http.GET | ||
import retrofit2.http.PUT | ||
import retrofit2.http.Path | ||
|
||
interface ProfileService { | ||
@GET("$ROOMS/{$ROOM_ID}/$KEYWORDS") | ||
suspend fun getRoomKeywords( | ||
@Path("${ROOM_ID}") roomId: Int, | ||
): BaseResponseDto<ResponseGetRoomKeywordsDto> | ||
|
||
@GET("$ROOMS/{$ROOM_ID}/$EXTRA") | ||
suspend fun getRoomExtra( | ||
@Path("${ROOM_ID}") roomId: Int, | ||
): BaseResponseDto<ResponseGetRoomExtraDto> | ||
|
||
@PUT("$ROOMS/${ROOM_ID}") | ||
suspend fun putRoomKeywordsExtra( | ||
@Path("${ROOM_ID}") roomId: Int, | ||
@Body requestPutRoomKeywordsExtraDto: RequestPutRoomKeywordsExtraDto, | ||
): NullableBaseResponseDto<Unit> | ||
|
||
companion object { | ||
const val ROOMS = "rooms" | ||
const val ROOM_ID = "roomId" | ||
const val KEYWORDS = "keywords" | ||
const val EXTRA = "extra" | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
data/src/main/java/com/dongguk/telepigeon/data/mapper/ResponseGetRoomExtraDtoMapper.kt
This file contains 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,11 @@ | ||
package com.dongguk.telepigeon.data.mapper | ||
|
||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomExtraDto | ||
import com.dongguk.telepigeon.domain.model.RoomExtraModel | ||
|
||
fun ResponseGetRoomExtraDto.toRoomKeywordExtraModel() = | ||
RoomExtraModel( | ||
gender = this.gender, | ||
ageRange = this.ageRange, | ||
relation = this.relation, | ||
) |
9 changes: 9 additions & 0 deletions
9
data/src/main/java/com/dongguk/telepigeon/data/mapper/ResponseGetRoomKeywordsDtoMapper.kt
This file contains 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,9 @@ | ||
package com.dongguk.telepigeon.data.mapper | ||
|
||
import com.dongguk.telepigeon.data.remote.model.response.ResponseGetRoomKeywordsDto | ||
import com.dongguk.telepigeon.domain.model.RoomKeywordsModel | ||
|
||
fun ResponseGetRoomKeywordsDto.toRoomKeywordModel() = | ||
RoomKeywordsModel( | ||
keywords = this.keywords.joinToString { ", " }, | ||
) |
12 changes: 12 additions & 0 deletions
12
data/src/main/java/com/dongguk/telepigeon/data/mapper/RoomKeywordsExtraModelMapper.kt
This file contains 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,12 @@ | ||
package com.dongguk.telepigeon.data.mapper | ||
|
||
import com.dongguk.telepigeon.data.remote.model.request.RequestPutRoomKeywordsExtraDto | ||
import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel | ||
|
||
fun RoomKeywordsExtraModel.toRequestPutRoomKeywordsExtraDto() = | ||
RequestPutRoomKeywordsExtraDto( | ||
keywords = this.keywords, | ||
gender = this.gender, | ||
ageRange = this.ageRange, | ||
relation = this.relation, | ||
) |
35 changes: 35 additions & 0 deletions
35
data/src/main/java/com/dongguk/telepigeon/data/repositoryimpl/ProfileRepositoryImpl.kt
This file contains 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,35 @@ | ||
package com.dongguk.telepigeon.data.repositoryimpl | ||
|
||
import com.dongguk.telepigeon.data.mapper.toRequestPutRoomKeywordsExtraDto | ||
import com.dongguk.telepigeon.data.mapper.toRoomKeywordExtraModel | ||
import com.dongguk.telepigeon.data.mapper.toRoomKeywordModel | ||
import com.dongguk.telepigeon.data.remote.datasource.ProfileRemoteDataSource | ||
import com.dongguk.telepigeon.domain.model.RoomExtraModel | ||
import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel | ||
import com.dongguk.telepigeon.domain.model.RoomKeywordsModel | ||
import com.dongguk.telepigeon.domain.repository.ProfileRepository | ||
import javax.inject.Inject | ||
|
||
class ProfileRepositoryImpl | ||
@Inject | ||
constructor( | ||
private val profileRemoteDataSource: ProfileRemoteDataSource, | ||
) : ProfileRepository { | ||
override suspend fun getRoomKeywords(roomId: Int): Result<RoomKeywordsModel> = | ||
runCatching { | ||
profileRemoteDataSource.getRoomKeywords(roomId = roomId).data.toRoomKeywordModel() | ||
} | ||
|
||
override suspend fun getRoomExtra(roomId: Int): Result<RoomExtraModel> = | ||
runCatching { | ||
profileRemoteDataSource.getRoomExtra(roomId = roomId).data.toRoomKeywordExtraModel() | ||
} | ||
|
||
override suspend fun putRoomKeywordExtra( | ||
roomId: Int, | ||
roomKeywordsExtraModel: RoomKeywordsExtraModel, | ||
): Result<Unit> = | ||
runCatching { | ||
profileRemoteDataSource.putRoomKeywordsExtra(roomId = roomId, requestPutRoomKeywordsExtraDto = roomKeywordsExtraModel.toRequestPutRoomKeywordsExtraDto()) | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
...eon/domain/model/RoomKeywordExtraModel.kt → ...telepigeon/domain/model/RoomExtraModel.kt
This file contains 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
8 changes: 8 additions & 0 deletions
8
domain/src/main/java/com/dongguk/telepigeon/domain/model/RoomKeywordsExtraModel.kt
This file contains 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,8 @@ | ||
package com.dongguk.telepigeon.domain.model | ||
|
||
data class RoomKeywordsExtraModel( | ||
val keywords: List<String>, | ||
val gender: String, | ||
val ageRange: String, | ||
val relation: String, | ||
) |
2 changes: 1 addition & 1 deletion
2
...lepigeon/domain/model/RoomKeywordModel.kt → ...epigeon/domain/model/RoomKeywordsModel.kt
This file contains 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 |
---|---|---|
@@ -1,5 +1,5 @@ | ||
package com.dongguk.telepigeon.domain.model | ||
|
||
data class RoomKeywordModel( | ||
data class RoomKeywordsModel( | ||
val keywords: String, | ||
) |
16 changes: 16 additions & 0 deletions
16
domain/src/main/java/com/dongguk/telepigeon/domain/repository/ProfileRepository.kt
This file contains 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,16 @@ | ||
package com.dongguk.telepigeon.domain.repository | ||
|
||
import com.dongguk.telepigeon.domain.model.RoomExtraModel | ||
import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel | ||
import com.dongguk.telepigeon.domain.model.RoomKeywordsModel | ||
|
||
interface ProfileRepository { | ||
suspend fun getRoomKeywords(roomId: Int): Result<RoomKeywordsModel> | ||
|
||
suspend fun getRoomExtra(roomId: Int): Result<RoomExtraModel> | ||
|
||
suspend fun putRoomKeywordExtra( | ||
roomId: Int, | ||
roomKeywordsExtraModel: RoomKeywordsExtraModel, | ||
): Result<Unit> | ||
} |
14 changes: 14 additions & 0 deletions
14
domain/src/main/java/com/dongguk/telepigeon/domain/usecase/GetRoomExtraUseCase.kt
This file contains 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,14 @@ | ||
package com.dongguk.telepigeon.domain.usecase | ||
|
||
import com.dongguk.telepigeon.domain.repository.ProfileRepository | ||
import javax.inject.Inject | ||
import javax.inject.Singleton | ||
|
||
@Singleton | ||
class GetRoomExtraUseCase | ||
@Inject | ||
constructor( | ||
private val profileRepository: ProfileRepository, | ||
) { | ||
suspend operator fun invoke(roomId: Int) = profileRepository.getRoomExtra(roomId = roomId) | ||
} |
14 changes: 14 additions & 0 deletions
14
domain/src/main/java/com/dongguk/telepigeon/domain/usecase/GetRoomKeywordsUseCase.kt
This file contains 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,14 @@ | ||
package com.dongguk.telepigeon.domain.usecase | ||
|
||
import com.dongguk.telepigeon.domain.repository.ProfileRepository | ||
import javax.inject.Inject | ||
import javax.inject.Singleton | ||
|
||
@Singleton | ||
class GetRoomKeywordsUseCase | ||
@Inject | ||
constructor( | ||
private val profileRepository: ProfileRepository, | ||
) { | ||
suspend operator fun invoke(roomId: Int) = profileRepository.getRoomKeywords(roomId = roomId) | ||
} |
18 changes: 18 additions & 0 deletions
18
domain/src/main/java/com/dongguk/telepigeon/domain/usecase/PutRoomKeywordExtraUseCase.kt
This file contains 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,18 @@ | ||
package com.dongguk.telepigeon.domain.usecase | ||
|
||
import com.dongguk.telepigeon.domain.model.RoomKeywordsExtraModel | ||
import com.dongguk.telepigeon.domain.repository.ProfileRepository | ||
import javax.inject.Inject | ||
import javax.inject.Singleton | ||
|
||
@Singleton | ||
class PutRoomKeywordExtraUseCase | ||
@Inject | ||
constructor( | ||
private val profileRepository: ProfileRepository, | ||
) { | ||
suspend operator fun invoke( | ||
roomId: Int, | ||
roomKeywordsExtraModel: RoomKeywordsExtraModel, | ||
) = profileRepository.putRoomKeywordExtra(roomId = roomId, roomKeywordsExtraModel = roomKeywordsExtraModel) | ||
} |
Oops, something went wrong.