update API parser

X1nto · Feb 14, 2024 · 3130319 · 3130319
1 parent 786f3b2
commit 3130319
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/androidApp/src/main/java/dev/xinto/argos/ui/screen/main/page/home/HomeViewModel.kt b/androidApp/src/main/java/dev/xinto/argos/ui/screen/main/page/home/HomeViewModel.kt
@@ -28,7 +28,10 @@ class HomeViewModel(
                     )
                 }
 
-                is DomainResponse.Error -> HomeState.Error
+                is DomainResponse.Error -> {
+                    println(lectures.error)
+                    HomeState.Error
+                }
             }
         }.stateIn(
             scope = viewModelScope,

diff --git a/shared/src/commonMain/kotlin/dev/xinto/argos/domain/courses/CoursesRepository.kt b/shared/src/commonMain/kotlin/dev/xinto/argos/domain/courses/CoursesRepository.kt
@@ -132,7 +132,7 @@ class CoursesRepository(
                     DomainCourseGroupSchedule(
                         day = attributes.day,
                         time = "${attributes.startTime} - ${attributes.endTime}",
-                        room = attributes.roomName,
+                        room = attributes.locationName,
                         info = attributes.info.ifBlank { null }
                     )
                 }

diff --git a/shared/src/commonMain/kotlin/dev/xinto/argos/domain/lectures/LecturesRepository.kt b/shared/src/commonMain/kotlin/dev/xinto/argos/domain/lectures/LecturesRepository.kt
@@ -16,10 +16,10 @@ class LecturesRepository(
                 DomainLectureInfo(
                     id = scheduleRelationships.course.data.id!!,
                     time = scheduleRelationships.hour.data.attributes.times,
-                    room = scheduleAttributes.roomName,
+                    room = scheduleAttributes.locationName,
                     name = scheduleRelationships.course.data.attributes.name,
                     lecturer = scheduleAttributes.info.ifEmpty {
-                        scheduleRelationships.group.data.relationships.lecturers.data[0].attributes.fullName
+                        scheduleRelationships.group.data.relationships?.lecturers?.data?.get(0)?.attributes?.fullName ?: ""
                     }
                 )
             }

diff --git a/shared/src/commonMain/kotlin/dev/xinto/argos/network/response/ApiResponse.kt b/shared/src/commonMain/kotlin/dev/xinto/argos/network/response/ApiResponse.kt
@@ -49,6 +49,14 @@ data class ApiResponseDataWithRelationships<A, R>(
     val type: String,
 )
 
+@Serializable
+data class ApiResponseDataWithPossibleRelationships<A, R>(
+    val id: String? = null,
+    val attributes: A,
+    val relationships: R? = null,
+    val type: String,
+)
+
 @Serializable
 data class ApiResponseRelationship<D>(
     val data: D

diff --git a/shared/src/commonMain/kotlin/dev/xinto/argos/network/response/ApiResponseSchedules.kt b/shared/src/commonMain/kotlin/dev/xinto/argos/network/response/ApiResponseSchedules.kt
@@ -19,7 +19,7 @@ data class ApiResponseSchedulesRelationships(
 data class ApiResponseScheduleRelationships(
     val hour: ApiResponseRelationship<ApiResponseData<ApiAttributesHour>>,
     val course: ApiResponseRelationship<ApiResponseData<ApiAttributesCourse>>,
-    val group: ApiResponseRelationship<ApiResponseDataWithRelationships<ApiAttributesGroup, ApiResponseScheduleGroupRelationships>>
+    val group: ApiResponseRelationship<ApiResponseDataWithPossibleRelationships<ApiAttributesGroup, ApiResponseScheduleGroupRelationships>>
 )
 
 @Serializable

diff --git a/...mmonMain/kotlin/dev/xinto/argos/network/response/attributes/ApiAttributesGroupSchedule.kt b/...mmonMain/kotlin/dev/xinto/argos/network/response/attributes/ApiAttributesGroupSchedule.kt
@@ -5,9 +5,10 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class ApiAttributesGroupSchedule(
     val day: String,
+    val date: String,
     val startTime: String,
     val endTime: String,
-    val roomName: String,
+    val locationName: String,
     val info: String,
     val lectureType: String,
     val scheduleConflictMessage: String?

diff --git a/...rc/commonMain/kotlin/dev/xinto/argos/network/response/attributes/ApiAttributesSchedule.kt b/...rc/commonMain/kotlin/dev/xinto/argos/network/response/attributes/ApiAttributesSchedule.kt
@@ -4,7 +4,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ApiAttributesSchedule(
-    val roomName: String,
+    val locationName: String,
     val info: String,
-    val lectureType: String,
+    val lectureTypeName: String,
+    val lectureFormatName: String,
 )