user5/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

sales and news request and test

Browse Source
This commit is contained in:
user5 2025-05-27 12:19:10 +03:00
parent c0de6f6606
commit 7f699d5478
8 changed files with 134 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api-core/src/main/java/com/example/api/core/data/core/ApiService.kt
View File

@ -1,8 +1,9 @@
package com.example.api.core.data.core
import com.example.api.core.data.dto.AuthUserResponseDto
import com.example.api.core.data.dto.RegisterUserDto
import com.example.api.core.data.dto.ProjectsDto
import com.example.api.core.data.dto.RegisterUserDto
import com.example.api.core.data.dto.SalesAndNewsDto
import com.example.api.core.data.dto.SignInUserDto
import com.example.api.core.data.dto.UserResponseDto
import retrofit2.http.Body
@ -25,6 +26,6 @@ internal interface ApiService {
@GET("collections/project/records")
suspend fun projects(): ProjectsDto
// @GET("collections/products/records")
// suspend fun products():
@GET("collections/news/records")
suspend fun salesAndNews(): SalesAndNewsDto
}

12
api-core/src/main/java/com/example/api/core/data/dto/SalesAndNewsDto.kt Normal file
View File

@ -0,0 +1,12 @@
package com.example.api.core.data.dto
import kotlinx.serialization.Serializable
@Serializable
internal data class SalesAndNewsDto(
val items: List<SalesAndNewsItemDto>,
val page: Int,
val perPage: Int,
val totalItems: Int,
val totalPages: Int
)

13
api-core/src/main/java/com/example/api/core/data/dto/SalesAndNewsItemDto.kt Normal file
View File

@ -0,0 +1,13 @@
package com.example.api.core.data.dto
import kotlinx.serialization.Serializable
@Serializable
internal data class SalesAndNewsItemDto(
val collectionId: String,
val collectionName: String,
val created: String,
val id: String,
val newsImage: String,
val updated: String
)

43
api-core/src/test/java/com/example/api/core/ServiceTest.kt
View File

@ -169,6 +169,49 @@ class ServiceTest {
assertEquals("/collections/project/records", request.path)
}
@Test
fun test_sales_and_news() = runBlocking {
val response = """
{
"items": [
{
"collectionId": "pbc_2599178718",
"collectionName": "News",
"created": "2025-05-26 14:21:46.284Z",
"id": "yxe08bp4woz996w",
"newsImage": "banner_u9uqsy4sf9.png",
"updated": "2025-05-26 15:29:41.083Z"
},
{
"collectionId": "pbc_2599178718",
"collectionName": "News",
"created": "2025-05-26 15:29:50.831Z",
"id": "lqg3hpgn46efgmz",
"newsImage": "banner_2_10pjar2fq7.png",
"updated": "2025-05-26 15:29:50.831Z"
}
],
"page": 1,
"perPage": 30,
"totalItems": 2,
"totalPages": 1
}
""".trimIndent()
mockWebServer.enqueue(MockResponse().setResponseCode(200).setBody(response))
val responseResult = service.salesAndNews()
val request = mockWebServer.takeRequest()
assertEquals(2, responseResult.items.size)
assertEquals("News", responseResult.items.first().collectionName)
assertEquals("lqg3hpgn46efgmz", responseResult.items[1].id)
assertEquals("GET", request.method)
assertEquals("/collections/news/records", request.path)
}
@After
fun teardown() {
mockWebServer.shutdown()

25
app/src/main/java/com/example/api/BaseViewModel.kt Normal file
View File

@ -0,0 +1,25 @@
package com.example.api
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
/**
* Автор: Манякин Дмитрий (user5)
* Дата создания: 27.05.2025
* */
abstract class BaseViewModel : ViewModel() {
protected fun<T> handle(action: suspend () -> T, ui: (T) -> Unit) {
viewModelScope.launch(Dispatchers.IO) {
val result = action.invoke()
withContext(Dispatchers.Main) {
ui.invoke(result)
}
}
}
}

43
app/src/main/java/com/example/api/MainViewModel.kt
View File

@ -1,18 +1,13 @@
package com.example.api
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.example.api.core.domain.ApiRepository
import com.example.api.core.domain.AuthUserResponse
import com.example.api.core.domain.RegisterUser
import com.example.api.core.domain.Projects
import com.example.api.core.domain.RegisterUser
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject
/**
@ -23,41 +18,39 @@ import javax.inject.Inject
@HiltViewModel
class MainViewModel @Inject constructor(
private val apiRepository: ApiRepository
) : ViewModel() {
) : BaseViewModel() {
private val _authUiState =
MutableStateFlow<FetchResultUiState<AuthUserResponse>>(FetchResultUiState.Initial())
val authUiState: StateFlow<FetchResultUiState<AuthUserResponse>>
get() = _authUiState.asStateFlow()
private val _ProjectsUiState =
private val _projectsUiState =
MutableStateFlow<FetchResultUiState<Projects>>(FetchResultUiState.Initial())
val projectsUiState: StateFlow<FetchResultUiState<Projects>>
get() = _ProjectsUiState.asStateFlow()
get() = _projectsUiState.asStateFlow()
fun auth(email: String, password: String) {
viewModelScope.launch(Dispatchers.IO) {
val result = apiRepository.auth(
RegisterUser(
email = email,
password = password,
passwordConfirm = password
handle(
action = {
apiRepository.auth(
RegisterUser(
email = email,
password = password,
passwordConfirm = password
)
)
)
withContext(Dispatchers.Main) {
_authUiState.value = result.map(FetchResultMapper())
}
) {
_authUiState.value = it.map(FetchResultMapper())
}
}
fun salesAndProjects() {
viewModelScope.launch(Dispatchers.IO) {
val result = apiRepository.projects()
withContext(Dispatchers.Main) {
_ProjectsUiState.value = result.map(FetchResultMapper())
}
handle(
action = { apiRepository.projects() }
) {
_projectsUiState.value = it.map(FetchResultMapper())
}
}
}

9
app/src/main/java/com/example/api/SalesAndNews.kt Normal file
View File

@ -0,0 +1,9 @@
package com.example.api
data class SalesAndNews(
val items: List<SalesAndNewsItem>,
val page: Int,
val perPage: Int,
val totalItems: Int,
val totalPages: Int
)

10
app/src/main/java/com/example/api/SalesAndNewsItem.kt Normal file
View File

@ -0,0 +1,10 @@
package com.example.api
data class SalesAndNewsItem(
val collectionId: String,
val collectionName: String,
val created: String,
val id: String,
val newsImage: String,
val updated: String
)