Merge branch 'develop' into prod

Author: MishkaV

.detekt/detekt-config.yml

@@ -93,7 +93,7 @@ complexity:
   active: true
   ComplexCondition:
     active: true
-    threshold: 4
+    threshold: 6
   ComplexInterface:
     active: false
     threshold: 10

README.md

@@ -1,6 +1,6 @@
-# OdooApp
+# OdooMobileX
 
-<a href=''><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width=200 align="middle"/></a>
+<a href='https://play.google.com/store/apps/details?id=odoo.miem.android'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width=200 align="middle"/></a>
 <a href='https://apps.rustore.ru/app/odoo.miem.android'><img alt='Get it on Rustore' src='documentation/stores/Rustore_logo.webp' width=200 align="middle"/></a>
 
 
@@ -28,6 +28,10 @@
 - Profile
   - Viewing of general info about user
   - Log out from current session
+- Employees
+  - Viewing list of employees
+  - Get detailed info about employee
+  - Search employee
 
 ## Example of screens
 <img src="documentation/screenshots/Auth.webp" width=300/> <img src="documentation/screenshots/Selecting_modules.webp" width=300/>
@@ -38,6 +42,8 @@
 
 <img src="documentation/screenshots/Kaban_full.webp" width=300/> <img src="documentation/screenshots/Kanban_empty.webp" width=300/>
 
+<img src="documentation/screenshots/Employee.webp" width=300/> <img src="documentation/screenshots/Employee_details.webp" width=300/>
+
 ## Stack
 - Kotlin
 - Jetpack Compose

common/network/crm/api/src/main/kotlin/odoo/miem/android/common/network/crm/api/entities/kanban/OpportunityCRM.kt

@@ -1,7 +1,7 @@
 package odoo.miem.android.common.network.crm.api.entities.kanban
 
-import odoo.miem.android.common.uiKitComponents.screen.recruitmentLike.model.DeadlineStatus
-import odoo.miem.android.common.uiKitComponents.screen.recruitmentLike.model.RecruitmentLikeEmployeeModel
+import odoo.miem.android.common.uiKitComponents.screenTemplates.recruitmentLike.model.DeadlineStatus
+import odoo.miem.android.common.uiKitComponents.screenTemplates.recruitmentLike.model.RecruitmentLikeEmployeeModel
 
 data class OpportunityCRM(
     override val name: String,

common/network/crm/api/src/main/kotlin/odoo/miem/android/common/network/crm/api/entities/kanban/StatusCRM.kt

@@ -1,6 +1,6 @@
 package odoo.miem.android.common.network.crm.api.entities.kanban
 
-import odoo.miem.android.common.uiKitComponents.screen.recruitmentLike.model.RecruitmentLikeStatusModel
+import odoo.miem.android.common.uiKitComponents.screenTemplates.recruitmentLike.model.RecruitmentLikeStatusModel
 
 data class StatusCRM(
     override val statusName: String,

common/network/crm/impl/src/main/kotlin/odoo/miem/android/common/network/crm/impl/CrmInteractor.kt

@@ -6,7 +6,7 @@ import odoo.miem.android.common.network.crm.api.entities.kanban.OpportunityCRM
 import odoo.miem.android.common.network.crm.api.entities.kanban.StatusCRM
 import odoo.miem.android.common.network.crm.impl.helper.MutableStatusCRM
 import odoo.miem.android.common.network.crm.impl.helper.toStatusCRM
-import odoo.miem.android.common.uiKitComponents.screen.recruitmentLike.model.DeadlineStatus
+import odoo.miem.android.common.uiKitComponents.screenTemplates.recruitmentLike.model.DeadlineStatus
 import odoo.miem.android.core.di.impl.api
 import odoo.miem.android.core.networkApi.crm.api.di.ICrmRepositoryApi
 import odoo.miem.android.core.networkApi.crm.api.entities.CrmKanbanStagesResponse

common/network/crm/impl/src/main/kotlin/odoo/miem/android/common/network/crm/impl/helper/MutableStatusCRM.kt

@@ -2,7 +2,7 @@ package odoo.miem.android.common.network.crm.impl.helper
 
 import odoo.miem.android.common.network.crm.api.entities.kanban.OpportunityCRM
 import odoo.miem.android.common.network.crm.api.entities.kanban.StatusCRM
-import odoo.miem.android.common.uiKitComponents.screen.recruitmentLike.model.RecruitmentLikeStatusModel
+import odoo.miem.android.common.uiKitComponents.screenTemplates.recruitmentLike.model.RecruitmentLikeStatusModel
 
 data class MutableStatusCRM(
     override val statusName: String,

common/network/employees/api/build.gradle.kts

@@ -4,4 +4,13 @@ plugins {
 
 android {
     namespace = "odoo.miem.android.common.network.employees.api"
+}
+
+dependencies {
+
+    // Components
+    implementation(project(":common:uiKitComponents"))
+
+    // utils
+    implementation(project(":common:utils"))
 }

common/network/employees/api/src/main/java/odoo/miem/android/common/network/employees/api/IEmployeesInteractor.kt

@@ -1,7 +1,9 @@
 package odoo.miem.android.common.network.employees.api
 
+import odoo.miem.android.common.network.employees.api.entities.AllEmployeesBasicInfo
 import odoo.miem.android.common.network.employees.api.entities.EmployeeBasicInfo
 import odoo.miem.android.common.network.employees.api.entities.EmployeeDetails
+import odoo.miem.android.common.utils.avatar.AvatarRequestHeader
 import odoo.miem.android.core.utils.state.ResultSingle
 
 /**
@@ -12,7 +14,11 @@ import odoo.miem.android.core.utils.state.ResultSingle
  */
 interface IEmployeesInteractor {
 
-    fun getAllEmployeesInfo(): ResultSingle<List<EmployeeBasicInfo>>
+    fun getAllEmployeesInfo(paginationOffset: Int = 0): ResultSingle<AllEmployeesBasicInfo>
 
-    fun getEmployeeDetails(employeeId: Int): ResultSingle<EmployeeDetails>
+    fun performEmployeesSearch(searchRequest: String): ResultSingle<List<EmployeeBasicInfo>>
+
+    fun getEmployeeAvatarRequestHeaders(): ResultSingle<List<AvatarRequestHeader>>
+
+    fun getEmployeeDetails(employeeId: Long): ResultSingle<EmployeeDetails>
 }

common/network/employees/api/src/main/java/odoo/miem/android/common/network/employees/api/entities/Entities.kt

@@ -1,17 +1,26 @@
 package odoo.miem.android.common.network.employees.api.entities
 
+import odoo.miem.android.common.uiKitComponents.screen.base.searchLike.model.SearchLikeModel
+
+data class AllEmployeesBasicInfo(
+    val maxSize: Int?,
+    val batchSize: Int?,
+    val employees: List<EmployeeBasicInfo>
+)
+
 data class EmployeeBasicInfo(
-    val id: Int?,
-    val name: String?,
+    val id: Long,
+    override val name: String,
     val job: String?,
     val email: String?,
     val phone: String?,
-    val avatar: String?
-)
+    val avatarLink: String?,
+) : SearchLikeModel
 
 data class EmployeeDetails(
-    val id: Int?,
+    val id: Long?,
     val name: String?,
+    val avatarLink: String?,
     val job: String?,
     val mobilePhone: String?,
     val workPhone: String?,
@@ -25,5 +34,6 @@ data class EmployeeDetails(
     val aboutMe: String?,
     val coach: String?,
     val manager: String?,
-    val employeeType: String?
+    val employeeType: String?,
+    val timeZone: String?
 )

common/network/employees/impl/build.gradle.kts

@@ -12,7 +12,13 @@ dependencies {
     // Employees API
     api(project(":common:network:employees:api"))
 
+    // common utils
+    implementation(project(":common:utils"))
+
     // Core
     // Network API - employees
     api(project(":core:networkApi:employees:api"))
+
+    // DataStore
+    api(project(":core:dataStore:api"))
 }