Merge branch 'features/events'

Author: CalamityDeadshot

app/src/main/java/ru/rtuitlab/itlab/data/remote/api/events/models/EventPlaceSalary.kt

@@ -0,0 +1,11 @@
+package ru.rtuitlab.itlab.data.remote.api.events.models
+
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EventPlaceSalary(
+    val placeId: String,
+    val count: Int,
+    val description: String
+)

app/src/main/java/ru/rtuitlab/itlab/data/remote/api/events/models/EventSalary.kt

@@ -7,8 +7,8 @@ import kotlinx.serialization.Serializable
 data class EventSalary(
     val eventId: String,
     val created: String,
-    val shiftSalaries: List<Int>,
-    val placeSalaries: List<Int>,
+    val shiftSalaries: List<EventShiftSalary>,
+    val placeSalaries: List<EventPlaceSalary>,
     val authorId: String,
     val modificationDate: String,
     val count: Int,

app/src/main/java/ru/rtuitlab/itlab/data/remote/api/events/models/EventShiftSalary.kt

@@ -0,0 +1,11 @@
+package ru.rtuitlab.itlab.data.remote.api.events.models
+
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EventShiftSalary(
+    val shiftId: String,
+    val count: Int,
+    val description: String
+)

app/src/main/java/ru/rtuitlab/itlab/domain/model/EventDetail.kt

@@ -1,5 +1,7 @@
 package ru.rtuitlab.itlab.domain.model
 
+import ru.rtuitlab.itlab.data.remote.api.events.models.EventPlaceSalary
+import ru.rtuitlab.itlab.data.remote.api.events.models.EventShiftSalary
 import ru.rtuitlab.itlab.data.remote.api.events.models.detail.Shift
 
 data class EventDetail(
@@ -14,6 +16,6 @@ data class EventDetail(
 	val description: String,
 	val type: String,
 	val shifts: List<Shift>,
-	val shiftSalaries: List<Int>,
-	val placeSalaries: List<Int>,
+	val shiftSalaries: List<EventShiftSalary>,
+	val placeSalaries: List<EventPlaceSalary>,
 )

app/src/main/java/ru/rtuitlab/itlab/presentation/screens/events/Event.kt

@@ -293,20 +293,26 @@ private fun EventShifts(
 							bottomSheetViewModel.show(
 								AppBottomSheet.EventShift(
 									shift,
-									salaries = shift.places.mapIndexed { index, _ ->
-										event.placeSalaries.getOrElse(index) {
-											event.shiftSalaries.getOrElse(event.shifts.indexOf(shift)) {
-												event.salary ?: -1
-											}
-										}
+									// If places salaries are specified, pass them
+									// Else, if this shift salary is specified, pass it - all places will be worth their shift
+									// If neither shift, nor places salary is specified, use event salary as default
+									// If none of the above is specified, pass -1.
+									salaries = shift.places.map { place ->
+										event.placeSalaries.find { placeSalary ->
+											place.id == placeSalary.placeId
+										}?.count ?:
+										event.shiftSalaries.find { shiftSalary ->
+											shift.id == shiftSalary.shiftId
+										}?.count ?:
+										event.salary ?: -1
 									},
 									eventViewModel = eventViewModel
 								),
 								coroutineScope
 							)
 						},
 					shift = shift,
-					salary = event.shiftSalaries.getOrElse(event.shifts.indexOf(shift)) { event.salary }
+					salary = event.shiftSalaries.find { it.shiftId == shift.id }?.count ?: event.salary
 				)
 			}
 		}