Skip to content

Commit 5a71f0d

Browse files
niyajaliniyajali
authored
Merge pull request #202 from skniyajali/154-enhancement-category
154 enhancement category
2 parents 5d8195e + 7b1b057 commit 5a71f0d

File tree

11 files changed

+114
-176
lines changed

11 files changed

+114
-176
lines changed

‎core/common/src/main/java/com/niyaj/common/tags/CategoryTestTags.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.niyaj.common.tags
22

33
object CategoryTestTags {
44

5-
const val CATEGORY_SCREEN_TITLE = "Categories"
6-
const val CATEGORY_NOT_AVAILABLE = "Category Not Available"
5+
const val CATEGORY_SCREEN_TITLE = "Dish Categories"
6+
const val CATEGORY_NOT_AVAILABLE = "Dish Category Not Available"
77
const val CATEGORY_SEARCH_PLACEHOLDER = "Search for Categories..."
88

99
const val ADD_EDIT_CATEGORY_BTN = "AddEdit Category Button"
@@ -12,8 +12,8 @@ object CategoryTestTags {
1212
const val UPDATE_CATEGORY = "Update Category"
1313
const val ADD_EDIT_CATEGORY_SCREEN = "AddUpdate Category Screen"
1414

15-
const val CATEGORY_NAME_FIELD = "Category Name"
16-
const val CATEGORY_NAME_ERROR = "Category Name Error"
15+
const val CATEGORY_NAME_FIELD = "Dish Category Name"
16+
const val CATEGORY_NAME_ERROR = "Dish Category Name Error"
1717

1818
const val CATEGORY_AVAILABLE_SWITCH = "Category Available Switch"
1919

‎core/common/src/main/java/com/niyaj/common/tags/ProductTestTags.kt

+25-25
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,48 @@ package com.niyaj.common.tags
22

33
object ProductTestTags {
44

5-
const val PRODUCT_SCREEN_TITLE = "Products"
6-
const val PRODUCT_NOT_AVAILABLE = "Product Not Available"
7-
const val NO_ITEMS_IN_PRODUCT = "Products Not Found"
8-
const val PRODUCT_SEARCH_PLACEHOLDER = "Search for Product..."
5+
const val PRODUCT_SCREEN_TITLE = "Dishes"
6+
const val PRODUCT_NOT_AVAILABLE = "Dish Not Available"
7+
const val NO_ITEMS_IN_PRODUCT = "Dishes Not Found"
8+
const val PRODUCT_SEARCH_PLACEHOLDER = "Search for Dish..."
99

10-
const val CREATE_NEW_PRODUCT = "Create New Product"
11-
const val EDIT_PRODUCT = "Update Product"
10+
const val CREATE_NEW_PRODUCT = "Create New Dish"
11+
const val EDIT_PRODUCT = "Update Dish"
1212

13-
const val PRODUCT_NAME_FIELD = "Product Name"
14-
const val PRODUCT_NAME_ERROR = "Product NameError"
13+
const val PRODUCT_NAME_FIELD = "Dish Name"
14+
const val PRODUCT_NAME_ERROR = "Dish NameError"
1515

16-
const val PRODUCT_CATEGORY_FIELD = "Category Name"
16+
const val PRODUCT_CATEGORY_FIELD = "Dish Category"
1717
const val PRODUCT_CATEGORY_ERROR = "CategoryError"
1818

19-
const val PRODUCT_PRICE_FIELD = "Product Price"
20-
const val PRODUCT_PRICE_ERROR = "Product PriceError"
19+
const val PRODUCT_PRICE_FIELD = "Dish Price"
20+
const val PRODUCT_PRICE_ERROR = "Dish PriceError"
2121

22-
const val PRODUCT_AVAILABILITY_FIELD = "Product Availability"
22+
const val PRODUCT_AVAILABILITY_FIELD = "Dish Availability"
2323

24-
const val ADD_EDIT_PRODUCT_BUTTON = "AddEdit ProductButton"
24+
const val ADD_EDIT_PRODUCT_BUTTON = "AddEdit DishButton"
2525

26-
const val PRODUCT_NAME_EMPTY_ERROR = "Product name must not be empty"
27-
const val PRODUCT_NAME_LENGTH_ERROR = "Product name must be more than 4 characters"
28-
const val PRODUCT_NAME_ALREADY_EXIST_ERROR = "Product name already exists."
26+
const val PRODUCT_NAME_EMPTY_ERROR = "Dish name must not be empty"
27+
const val PRODUCT_NAME_LENGTH_ERROR = "Dish name must be more than 4 characters"
28+
const val PRODUCT_NAME_ALREADY_EXIST_ERROR = "Dish name already exists."
2929

30-
const val PRODUCT_PRICE_EMPTY_ERROR = "Product price must not be empty."
31-
const val PRODUCT_PRICE_LENGTH_ERROR = "Product price must be at least 10 rupees."
30+
const val PRODUCT_PRICE_EMPTY_ERROR = "Dish price must not be empty."
31+
const val PRODUCT_PRICE_LENGTH_ERROR = "Dish price must be at least 10 rupees."
3232

33-
const val PRODUCT_CATEGORY_EMPTY_ERROR = "Product category must not be empty."
33+
const val PRODUCT_CATEGORY_EMPTY_ERROR = "Dish category must not be empty."
3434

35-
const val DELETE_PRODUCT_TITLE = "Delete Product?"
36-
const val DELETE_PRODUCT_MESSAGE = "Are you sure to delete these products?"
35+
const val DELETE_PRODUCT_TITLE = "Delete Dish?"
36+
const val DELETE_PRODUCT_MESSAGE = "Are you sure to delete these dishes?"
3737

38-
const val PRODUCT_TAG = "Product-"
38+
const val PRODUCT_TAG = "Dish-"
3939

40-
const val EXPORT_PRODUCTS_TITLE = "Export Products"
40+
const val EXPORT_PRODUCTS_TITLE = "Export Dishes"
4141

42-
const val IMPORT_PRODUCTS_TITLE = "Import Products"
42+
const val IMPORT_PRODUCTS_TITLE = "Import Dishes"
4343
const val IMPORT_PRODUCTS_NOTE_TEXT = "Make sure to open products.json file."
4444

4545
const val INCREASE_PRODUCTS_TITLE = "Increase Price"
46-
const val INCREASE_PRODUCTS_TEXT_FIELD = "Product Price"
46+
const val INCREASE_PRODUCTS_TEXT_FIELD = "Dish Price"
4747

4848
const val DECREASE_PRODUCTS_TITLE = "Decrease Price"
4949

‎core/data/src/main/java/com/niyaj/data/data/repository/CategoryRepositoryImpl.kt

+41-102
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.niyaj.common.tags.CategoryTestTags.CATEGORY_NAME_EMPTY_ERROR
55
import com.niyaj.common.tags.CategoryTestTags.CATEGORY_NAME_LENGTH_ERROR
66
import com.niyaj.common.utils.Resource
77
import com.niyaj.common.utils.ValidationResult
8+
import com.niyaj.data.mapper.toEntity
89
import com.niyaj.data.repository.CategoryRepository
910
import com.niyaj.data.repository.validation.CategoryValidationRepository
1011
import com.niyaj.data.utils.collectWithSearch
@@ -20,9 +21,8 @@ import io.realm.kotlin.ext.query
2021
import io.realm.kotlin.query.Sort
2122
import kotlinx.coroutines.CoroutineDispatcher
2223
import kotlinx.coroutines.flow.Flow
23-
import kotlinx.coroutines.flow.channelFlow
24+
import kotlinx.coroutines.flow.mapLatest
2425
import kotlinx.coroutines.withContext
25-
import org.mongodb.kbson.BsonObjectId
2626
import timber.log.Timber
2727

2828
class CategoryRepositoryImpl(
@@ -37,24 +37,17 @@ class CategoryRepositoryImpl(
3737
}
3838

3939
override suspend fun getAllCategories(searchText: String): Flow<List<Category>> {
40-
return channelFlow {
41-
withContext(ioDispatcher) {
42-
try {
43-
val items = realm.query<CategoryEntity>()
44-
.sort("categoryId", Sort.ASCENDING)
45-
.find()
46-
.asFlow()
47-
40+
return withContext(ioDispatcher) {
41+
realm.query<CategoryEntity>()
42+
.sort("categoryId", Sort.ASCENDING)
43+
.find()
44+
.asFlow()
45+
.mapLatest { items ->
4846
items.collectWithSearch(
4947
transform = { it.toExternalModel() },
5048
searchFilter = { it.filterCategory(searchText) },
51-
send = { send(it) }
5249
)
53-
54-
} catch (e: Exception) {
55-
send(emptyList())
5650
}
57-
}
5851
}
5952
}
6053

@@ -69,60 +62,33 @@ class CategoryRepositoryImpl(
6962
}
7063
}
7164

72-
override fun findCategoryByName(name: String, categoryId: String?): Boolean {
73-
val category = if (categoryId.isNullOrEmpty()) {
74-
realm.query<CategoryEntity>("categoryName == $0", name).first().find()
75-
} else {
76-
realm.query<CategoryEntity>("categoryId != $0 && categoryName == $1", categoryId, name)
77-
.first()
78-
.find()
79-
}
80-
81-
return category != null
82-
}
83-
84-
override suspend fun createNewCategory(newCategory: Category): Resource<Boolean> {
85-
return try {
86-
withContext(ioDispatcher) {
87-
val validateCategoryName = validateCategoryName(newCategory.categoryName)
88-
89-
if (validateCategoryName.successful) {
90-
val category = CategoryEntity()
91-
category.categoryId =
92-
newCategory.categoryId.ifEmpty { BsonObjectId().toHexString() }
93-
category.categoryName = newCategory.categoryName
94-
category.categoryAvailability = newCategory.categoryAvailability
95-
category.createdAt =
96-
newCategory.createdAt.ifEmpty { System.currentTimeMillis().toString() }
97-
98-
realm.write {
99-
this.copyToRealm(category)
100-
}
101-
102-
Resource.Success(true)
103-
} else {
104-
Resource.Error(
105-
validateCategoryName.errorMessage ?: "Unable to create category"
106-
)
107-
}
108-
}
109-
} catch (e: Exception) {
110-
Resource.Error(e.message ?: "Unable to create new category")
65+
override suspend fun findCategoryByName(name: String, categoryId: String?): Boolean {
66+
return withContext(ioDispatcher) {
67+
if (categoryId.isNullOrEmpty()) {
68+
realm.query<CategoryEntity>("categoryName == $0", name).first().find()
69+
} else {
70+
realm.query<CategoryEntity>(
71+
"categoryId != $0 && categoryName == $1",
72+
categoryId,
73+
name
74+
)
75+
.first()
76+
.find()
77+
} != null
11178
}
11279
}
11380

114-
override suspend fun updateCategory(
81+
override suspend fun createOrUpdateCategory(
11582
updatedCategory: Category,
11683
categoryId: String
11784
): Resource<Boolean> {
11885
return try {
11986
withContext(ioDispatcher) {
120-
val validateCategoryName =
121-
validateCategoryName(updatedCategory.categoryName, categoryId)
87+
val validateName = validateCategoryName(updatedCategory.categoryName, categoryId)
12288

123-
if (validateCategoryName.successful) {
124-
val category =
125-
realm.query<CategoryEntity>("categoryId == $0", categoryId).first().find()
89+
if (validateName.successful) {
90+
val category = realm.query<CategoryEntity>("categoryId == $0", categoryId)
91+
.first().find()
12692

12793
if (category != null) {
12894
realm.write {
@@ -135,55 +101,21 @@ class CategoryRepositoryImpl(
135101

136102
Resource.Success(true)
137103
} else {
138-
Resource.Error(
139-
validateCategoryName.errorMessage ?: "Unable to update category"
140-
)
104+
realm.write {
105+
this.copyToRealm(updatedCategory.toEntity())
106+
}
107+
108+
Resource.Success(true)
141109
}
142110
} else {
143-
Resource.Error(
144-
validateCategoryName.errorMessage ?: "Unable to update category"
145-
)
111+
Resource.Error(validateName.errorMessage ?: "Unable")
146112
}
147113
}
148114
} catch (e: Exception) {
149115
Resource.Error(e.message ?: "Unable to update category")
150116
}
151117
}
152118

153-
override suspend fun deleteCategory(categoryId: String): Resource<Boolean> {
154-
return try {
155-
val category =
156-
realm.query<CategoryEntity>("categoryId == $0", categoryId).first().find()
157-
158-
if (category != null) {
159-
withContext(ioDispatcher) {
160-
realm.write {
161-
val products =
162-
this.query<ProductEntity>("category.categoryId == $0", categoryId)
163-
.find()
164-
val cartOrders =
165-
this.query<CartEntity>("product.category.categoryId == $0", categoryId)
166-
.find()
167-
168-
delete(cartOrders)
169-
170-
delete(products)
171-
172-
findLatest(category)?.let {
173-
delete(it)
174-
}
175-
}
176-
}
177-
178-
Resource.Success(true)
179-
} else {
180-
Resource.Error("Unable to find category")
181-
}
182-
} catch (e: Exception) {
183-
Resource.Error(e.message ?: "Unable to delete category")
184-
}
185-
}
186-
187119
override suspend fun deleteCategories(categoryIds: List<String>): Resource<Boolean> {
188120
return try {
189121
withContext(ioDispatcher) {
@@ -227,7 +159,10 @@ class CategoryRepositoryImpl(
227159
}
228160
}
229161

230-
override fun validateCategoryName(categoryName: String, categoryId: String?): ValidationResult {
162+
override suspend fun validateCategoryName(
163+
categoryName: String,
164+
categoryId: String?
165+
): ValidationResult {
231166
if (categoryName.isEmpty()) {
232167
return ValidationResult(
233168
successful = false,
@@ -242,7 +177,11 @@ class CategoryRepositoryImpl(
242177
)
243178
}
244179

245-
if (this.findCategoryByName(categoryName, categoryId)) {
180+
val result = withContext(ioDispatcher) {
181+
findCategoryByName(categoryName, categoryId)
182+
}
183+
184+
if (result) {
246185
return ValidationResult(
247186
successful = false,
248187
errorMessage = CATEGORY_NAME_ALREADY_EXIST_ERROR

‎core/data/src/main/java/com/niyaj/data/mapper/CategoryMapper.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package com.niyaj.data.mapper
22

33
import com.niyaj.database.model.CategoryEntity
44
import com.niyaj.model.Category
5+
import org.mongodb.kbson.BsonObjectId
56

67
fun Category.toEntity(): CategoryEntity {
78
return CategoryEntity(
8-
categoryId = categoryId,
9+
categoryId = categoryId.ifEmpty { BsonObjectId().toHexString() },
910
categoryName = categoryName,
1011
categoryAvailability = categoryAvailability,
1112
createdAt = createdAt,

‎core/data/src/main/java/com/niyaj/data/repository/CategoryRepository.kt

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ interface CategoryRepository {
1010

1111
suspend fun getCategoryById(categoryId: String): Resource<Category?>
1212

13-
fun findCategoryByName(name: String, categoryId: String?): Boolean
13+
suspend fun findCategoryByName(name: String, categoryId: String?): Boolean
1414

15-
suspend fun createNewCategory(newCategory: Category): Resource<Boolean>
16-
17-
suspend fun updateCategory(updatedCategory: Category, categoryId: String): Resource<Boolean>
18-
19-
suspend fun deleteCategory(categoryId: String): Resource<Boolean>
15+
suspend fun createOrUpdateCategory(
16+
updatedCategory: Category,
17+
categoryId: String
18+
): Resource<Boolean>
2019

2120
suspend fun deleteCategories(categoryIds: List<String>): Resource<Boolean>
2221
}

‎core/data/src/main/java/com/niyaj/data/repository/validation/CategoryValidationRepository.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@ import com.niyaj.common.utils.ValidationResult
44

55
interface CategoryValidationRepository {
66

7-
fun validateCategoryName(categoryName: String, categoryId: String? = null): ValidationResult
7+
suspend fun validateCategoryName(
8+
categoryName: String,
9+
categoryId: String? = null
10+
): ValidationResult
811
}

‎feature/category/src/main/java/com/niyaj/feature/category/CategoryScreen.kt

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package com.niyaj.feature.category
22

33
import androidx.activity.compose.BackHandler
44
import androidx.compose.animation.Crossfade
5+
import androidx.compose.foundation.layout.fillMaxSize
6+
import androidx.compose.foundation.layout.padding
57
import androidx.compose.foundation.lazy.grid.GridCells
68
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
79
import androidx.compose.foundation.lazy.grid.items
@@ -11,6 +13,7 @@ import androidx.compose.material.ScaffoldState
1113
import androidx.compose.runtime.Composable
1214
import androidx.compose.runtime.LaunchedEffect
1315
import androidx.compose.runtime.rememberCoroutineScope
16+
import androidx.compose.ui.Modifier
1417
import androidx.hilt.navigation.compose.hiltViewModel
1518
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1619
import androidx.navigation.NavController
@@ -21,6 +24,7 @@ import com.niyaj.common.tags.CategoryTestTags.CREATE_NEW_CATEGORY
2124
import com.niyaj.common.tags.CategoryTestTags.DELETE_CATEGORY_ITEM_MESSAGE
2225
import com.niyaj.common.tags.CategoryTestTags.DELETE_CATEGORY_ITEM_TITLE
2326
import com.niyaj.common.utils.Constants.SEARCH_ITEM_NOT_FOUND
27+
import com.niyaj.designsystem.theme.SpaceSmall
2428
import com.niyaj.feature.category.components.CategoryData
2529
import com.niyaj.feature.category.destinations.AddEditCategoryScreenDestination
2630
import com.niyaj.ui.components.ItemNotAvailable
@@ -50,7 +54,7 @@ import kotlinx.coroutines.launch
5054
* @param navController
5155
* @param scaffoldState
5256
* @param viewModel
53-
// * @param resultRecipient
57+
* @param resultRecipient
5458
* @see CategoryViewModel
5559
*/
5660
@RootNavGraph(start = true)
@@ -193,6 +197,9 @@ fun CategoryScreen(
193197

194198
is UiState.Success -> {
195199
LazyVerticalGrid(
200+
modifier = Modifier
201+
.fillMaxSize()
202+
.padding(SpaceSmall),
196203
columns = GridCells.Fixed(2),
197204
state = lazyGridState,
198205
) {

0 commit comments

Comments
 (0)