Merge branch 'dev' into user_profile

Author: vita133

app/src/main/java/com/fictadvisor/android/data/dto/schedule/DetailedEventResponse.kt

@@ -3,7 +3,7 @@ package com.fictadvisor.android.data.dto.schedule
 data class DetailedEventResponse(
     val url: String,
     val eventInfo: String,
-    val disciplineType: TDiscipline,
+    val eventType: TDiscipline,
     val disciplineInfo: String,
     val period: TEventPeriod,
     val teachers: List<Teacher>

app/src/main/java/com/fictadvisor/android/data/dto/schedule/PatchEventDTO.kt

@@ -2,13 +2,16 @@ package com.fictadvisor.android.data.dto.schedule
 
 data class PatchEventDTO(
     val week: Int,
+    val name: String,
     val changeStartDate: Boolean,
     val changeEndDate: Boolean,
-    val disciplineType: String? = null,
+    val eventType: TDiscipline? = null,
     val url: String,
     val eventInfo: String,
     val disciplineInfo: String,
     val period: TEventPeriod,
     val teachers: List<String>,
-    val disciplineId: String
+    val disciplineId: String,
+    val startTime: String,
+    val endTime: String
 )

app/src/main/java/com/fictadvisor/android/data/dto/schedule/PostEventDTO.kt

@@ -2,11 +2,14 @@ package com.fictadvisor.android.data.dto.schedule
 
 data class PostEventDTO (
     val groupId: String,
+    val name: String,
     val teachers: List<String>,
     val disciplineId: String,
     val url: String,
     val eventInfo: String,
-    val disciplineType: TDiscipline,
+    val eventType: TDiscipline,
     val disciplineInfo: String,
     val period: TEventPeriod,
-    )
+    val startTime: String,
+    val endTime: String
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/AddContactBody.kt

@@ -0,0 +1,7 @@
+package com.fictadvisor.android.data.dto.user
+
+data class AddContactBody(
+    val name: ContactType,
+    val displayName: String,
+    val link: String
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/ChangeAvatarResponse.kt

@@ -0,0 +1,10 @@
+package com.fictadvisor.android.data.dto.user
+
+data class ChangeAvatarResponse(
+    val id: String,
+    val email: String,
+    val username: String,
+    val telegramId: Long,
+    val avatar: String,
+    val state: UserGroupState
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/ChangeInfoBody.kt

@@ -0,0 +1,9 @@
+package com.fictadvisor.android.data.dto.user
+
+data class ChangeInfoBody(
+    val firstName: String?,
+    val lastName: String?,
+    val middleName: String?,
+    val groupId: String?,
+    val state: UserGroupState?
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/ChangeRoleBody.kt

@@ -0,0 +1,5 @@
+package com.fictadvisor.android.data.dto.user
+
+data class ChangeRoleBody(
+    val roleId: String
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/ChangeUserBody.kt

@@ -0,0 +1,7 @@
+package com.fictadvisor.android.data.dto.user
+
+data class ChangeUserBody(
+    val email: String?,
+    val username: String?,
+    val state: UserGroupState?
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/Contact.kt

@@ -0,0 +1,8 @@
+package com.fictadvisor.android.data.dto.user
+
+data class Contact(
+    val link: String,
+    val id: String,
+    val name: ContactType,
+    val displayName: String
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/ContactType.kt

@@ -0,0 +1,12 @@
+package com.fictadvisor.android.data.dto.user
+
+enum class ContactType {
+    YOUTUBE,
+    DISCORD,
+    TELEGRAM,
+    INSTAGRAM,
+    FACEBOOK,
+    GITHUB,
+    TWITTER,
+    MAIL
+}

app/src/main/java/com/fictadvisor/android/data/dto/user/GetContactsResponse.kt

@@ -0,0 +1,5 @@
+package com.fictadvisor.android.data.dto.user
+
+data class GetContactsResponse(
+    val contacts: List<Contact>
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/GetSelectiveDisciplinesBySemesterResponse.kt

@@ -0,0 +1,5 @@
+package com.fictadvisor.android.data.dto.user
+
+data class GetSelectiveDisciplinesBySemesterResponse(
+    val selective: List<UserSelective>
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/GetSelectiveDisciplinesResponse.kt

@@ -0,0 +1,8 @@
+package com.fictadvisor.android.data.dto.user
+
+data class GetSelectiveDisciplinesResponse(
+    val availableSelectiveAmount: Int,
+    val year: Int,
+    val semester: Int,
+    val remainingSelective: List<UserRemainingSelective>
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/GetSelectiveResponse.kt

@@ -0,0 +1,5 @@
+package com.fictadvisor.android.data.dto.user
+
+data class GetSelectiveResponse(
+    val disciplines: List<String>
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/PostSelectiveDisciplinesBody.kt

@@ -0,0 +1,5 @@
+package com.fictadvisor.android.data.dto.user
+
+data class PostSelectiveDisciplinesBody(
+    val disciplines: List<String>
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/RequestNewGroupBody.kt

@@ -0,0 +1,6 @@
+package com.fictadvisor.android.data.dto.user
+
+data class RequestNewGroupBody(
+    val groupId: String,
+    val isCaptain: Boolean
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/SimplifiedUser.kt

@@ -0,0 +1,10 @@
+package com.fictadvisor.android.data.dto.user
+
+data class SimplifiedUser(
+    val id: String,
+    val email: String,
+    val username: String,
+    val telegramId: Long?,
+    val avatar: String?,
+    val state: UserGroupState
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/UserDTOResponse.kt

@@ -0,0 +1,14 @@
+package com.fictadvisor.android.data.dto.user
+
+data class UserDTOResponse(
+    val id: String,
+    val firstName: String,
+    val middleName: String,
+    val lastName: String,
+    val state: UserGroupState,
+    val username: String,
+    val email: String,
+    val avatar: String,
+    val telegramId: Long,
+    val group: UserGroup
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/UserGroup.kt

@@ -0,0 +1,8 @@
+package com.fictadvisor.android.data.dto.user
+
+data class UserGroup(
+    val id: String,
+    val code: String,
+    val role: UserGroupRole?,
+    val state: UserGroupState
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/UserGroupRole.kt

@@ -0,0 +1,7 @@
+package com.fictadvisor.android.data.dto.user
+
+enum class UserGroupRole {
+    CAPTAIN,
+    MODERATOR,
+    STUDENT
+}

app/src/main/java/com/fictadvisor/android/data/dto/user/UserGroupState.kt

@@ -0,0 +1,7 @@
+package com.fictadvisor.android.data.dto.user
+
+enum class UserGroupState {
+    APPROVED,
+    DECLINED,
+    PENDING
+}

app/src/main/java/com/fictadvisor/android/data/dto/user/UserRemainingSelective.kt

@@ -0,0 +1,6 @@
+package com.fictadvisor.android.data.dto.user
+
+data class UserRemainingSelective(
+    val disciplineId: String,
+    val subjectName: String
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/UserSelective.kt

@@ -0,0 +1,8 @@
+package com.fictadvisor.android.data.dto.user
+
+data class UserSelective(
+    val semester: Int,
+    val year: Int,
+    val disciplines: List<String>,
+    val amount: Int
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/VerifyStudentBody.kt

@@ -0,0 +1,6 @@
+package com.fictadvisor.android.data.dto.user
+
+data class VerifyStudentBody(
+    val state: UserGroupState,
+    val isCaptain: Boolean
+)

app/src/main/java/com/fictadvisor/android/data/dto/user/VerifyStudentResponse.kt

@@ -0,0 +1,5 @@
+package com.fictadvisor.android.data.dto.user
+
+data class VerifyStudentResponse(
+    val students: List<UserDTOResponse>
+)

app/src/main/java/com/fictadvisor/android/data/remote/RetrofitClient.kt

@@ -3,6 +3,7 @@ package com.fictadvisor.android.data.remote
 import com.fictadvisor.android.data.remote.api.AuthApi
 import com.fictadvisor.android.data.remote.api.GroupApi
 import com.fictadvisor.android.data.remote.api.ScheduleApi
+import com.fictadvisor.android.data.remote.api.UserApi
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -73,4 +74,10 @@ object RetrofitClient {
             .create(ScheduleApi::class.java)
     }
 
+    val userApi: UserApi by lazy {
+        retrofitClient
+            .build()
+            .create(UserApi::class.java)
+    }
+
 }

app/src/main/java/com/fictadvisor/android/data/remote/api/ScheduleApi.kt

@@ -8,6 +8,7 @@ import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.Header
 import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.Path
@@ -25,6 +26,7 @@ interface ScheduleApi {
 
     @GET("/v2/schedule/groups/{groupId}/events")
     suspend fun getEventsAuthorized(
+        @Header("Authorization") token: String,
         @Path("groupId") groupId: String,
         @Query("week") week: Int,
         @Query("showOwnSelective") showOwnSelective: Boolean,
@@ -36,24 +38,28 @@ interface ScheduleApi {
 
     @GET("/v2/schedule/events/{eventId}")
     suspend fun getEventInfo(
+        @Header("Authorization") token: String,
         @Path("eventId") eventId: String,
         @Query("week") week: Any // You can define the type accordingly
     ): Response<DetailedEventResponse>
 
     @DELETE("/v2/schedule/groups/{groupId}/events/{eventId}")
     suspend fun deleteEventById(
+        @Header("Authorization") token: String,
         @Path("groupId") groupId: String,
         @Path("eventId") eventId: String
     ): Response<DetailedEventResponse>
 
     @POST("/v2/schedule/events")
     suspend fun addEvent(
+        @Header("Authorization") token: String,
         @Body body: PostEventDTO,
         @Query("groupId") groupId: String
     ): Response<DetailedEventResponse>
 
     @PATCH("/v2/schedule/groups/{groupId}/events/{eventId}")
     suspend fun editEvent(
+        @Header("Authorization") token: String,
         @Body body: PatchEventDTO,
         @Path("groupId") groupId: String,
         @Path("eventId") eventId: String