Merge pull request #59 from Team-B1ND/release/57_release_2.2.0

Version Up

buildSrc/src/main/java/ProjectProperties.kt

@@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
 
 object ProjectProperties {
     const val VERSION_CODE = 30
-    const val VERSION_NAME = "2.1.2"
+    const val VERSION_NAME = "2.2.0"
 
     const val APPLICATION_ID = "kr.hs.dgsw.smartschool.dodamdodam_teacher"
     const val NAME_SPACE_DOMAIN = "kr.hs.dgsw.smartschool.domain"

data/src/main/java/kr/hs/dgsw/smartschool/data/datasource/member/MemberCacheDataSource.kt

@@ -8,9 +8,9 @@ interface MemberCacheDataSource {
 
     suspend fun getMemberById(id: String): Member?
 
-    suspend fun getMemberByTeacherId(id: Int): Member?
-
-    suspend fun getMemberByStudentId(id: Int): Member?
+//    suspend fun getMemberByTeacherId(id: Int): Member?
+//
+//    suspend fun getMemberByStudentId(id: Int): Member?
 
     suspend fun deleteAllMember()
 

data/src/main/java/kr/hs/dgsw/smartschool/data/datasource/member/MemberRemoteDataSource.kt

@@ -1,18 +1,16 @@
 package kr.hs.dgsw.smartschool.data.datasource.member
 
-import kr.hs.dgsw.smartschool.data.data.member.MemberData
-import kr.hs.dgsw.smartschool.domain.model.member.student.Student
-import kr.hs.dgsw.smartschool.domain.model.member.teacher.Teacher
+import kr.hs.dgsw.smartschool.domain.model.member.Member
 
 interface MemberRemoteDataSource {
 
-    suspend fun getMembers(): MemberData
+    suspend fun getMembers(): List<Member>
 
-    suspend fun getMyInfo(): Teacher
+    suspend fun getMyInfo(): Member
 
-    suspend fun getSortedStudents(): List<Student>
-
-    suspend fun getStudents(): List<Student>
-
-    suspend fun getTeachers(): List<Teacher>
+//    suspend fun getSortedStudents(): List<Student>
+//
+//    suspend fun getStudents(): List<Student>
+//
+//    suspend fun getTeachers(): List<Teacher>
 }

data/src/main/java/kr/hs/dgsw/smartschool/data/datasource/night_study/NightStudyRemoteDataSource.kt

@@ -4,8 +4,8 @@ import kr.hs.dgsw.smartschool.domain.model.night_study.NightStudy
 
 interface NightStudyRemoteDataSource {
 
-    suspend fun getNightStudyByDate(date: String): List<NightStudy>
-
+//    suspend fun getNightStudyByDate(date: String): List<NightStudy>
+//
     suspend fun getNightStudy(): List<NightStudy>
 
     suspend fun allowNightStudy(id: Int)

data/src/main/java/kr/hs/dgsw/smartschool/data/datasource/out/OutCacheDataSource.kt

@@ -1,12 +1,9 @@
 package kr.hs.dgsw.smartschool.data.datasource.out
 
-import kr.hs.dgsw.smartschool.domain.model.out.Out
 import kr.hs.dgsw.smartschool.domain.model.out.OutItem
 
 interface OutCacheDataSource {
 
-    suspend fun getAllOut(): Out
-
     suspend fun getOutById(id: Int): OutItem?
 
     suspend fun getOutByStatus(status: String): List<OutItem>

data/src/main/java/kr/hs/dgsw/smartschool/data/datasource/out/OutRemoteDataSource.kt

@@ -5,25 +5,29 @@ import kr.hs.dgsw.smartschool.domain.model.out.OutItem
 
 interface OutRemoteDataSource {
 
-    suspend fun getOutsByDate(date: String): Out
+    suspend fun getOutgoingByDate(date: String): List<Out>
+
+    suspend fun getOutSleepingByDate(data: String): List<Out>
+
+    suspend fun getOutSleepingValidByDate(): List<Out>
 
     suspend fun getOutgoing(id: Int): OutItem
 
     suspend fun deleteOutgoing(id: Int)
 
-    suspend fun allowOutgoing(ids: List<Int>)
+    suspend fun allowOutgoing(id: Int)
 
-    suspend fun cancelAllowOutgoing(ids: List<Int>)
+    suspend fun cancelAllowOutgoing(id: Int)
 
     suspend fun denyOutgoing(ids: List<Int>)
 
     suspend fun getOutsleeping(id: Int): OutItem
 
     suspend fun deleteOutsleeping(id: Int)
 
-    suspend fun allowOutsleeping(ids: List<Int>)
+    suspend fun allowOutsleeping(id: Int)
 
-    suspend fun cancelAllowOutsleeping(ids: List<Int>)
+    suspend fun cancelAllowOutsleeping(id: Int)
 
     suspend fun denyOutsleeping(ids: List<Int>)
 }

data/src/main/java/kr/hs/dgsw/smartschool/data/datasource/point/PointRemoteDataSource.kt

@@ -9,10 +9,11 @@ interface PointRemoteDataSource {
 
     suspend fun getPoint(
         studentId: Int,
-        pointType: PointType,
+        pointType: PointPlace,
     ): List<Point>
 
     suspend fun givePoint(
+        id: Int,
         givenDate: String,
         place: PointPlace,
         reason: String,
@@ -21,5 +22,5 @@ interface PointRemoteDataSource {
         type: PointType,
     )
 
-    suspend fun getReason(pointType: PointType): List<PointReason>
+    suspend fun getReason(type: PointPlace): List<PointReason>
 }

data/src/main/java/kr/hs/dgsw/smartschool/data/repository/AuthRepositoryImpl.kt

@@ -3,7 +3,6 @@ package kr.hs.dgsw.smartschool.data.repository
 import kr.hs.dgsw.smartschool.data.base.BaseRepository
 import kr.hs.dgsw.smartschool.data.datasource.auth.AuthCacheDataSource
 import kr.hs.dgsw.smartschool.data.datasource.auth.AuthRemoteDataSource
-import kr.hs.dgsw.smartschool.data.utils.encryptSHA512
 import kr.hs.dgsw.smartschool.domain.model.token.Token
 import kr.hs.dgsw.smartschool.domain.repository.AuthRepository
 import javax.inject.Inject
@@ -28,14 +27,14 @@ class AuthRepositoryImpl @Inject constructor(
             name = name,
             phone = phone,
             position = position,
-            pw = pw.encryptSHA512(),
+            pw = pw,
             tel = tel
         )
     }
 
     override suspend fun login(id: String, pw: String, enableAutoLogin: Boolean): Token {
-        val password = pw.encryptSHA512()
-        return remote.login(id, password).let {
+        val password = pw
+        return remote.login(id, pw).let {
             cache.insertMember(it.member)
             cache.insertToken(it.token)
             if (enableAutoLogin) {