Skip to content

Commit

Permalink
Merge pull request #59 from Team-B1ND/release/57_release_2.2.0
Browse files Browse the repository at this point in the history
Version Up
  • Loading branch information
wnsgur1 authored Apr 10, 2024
2 parents 0a26248 + 8239d6d commit 9ac77de
Show file tree
Hide file tree
Showing 207 changed files with 1,312 additions and 4,610 deletions.
28 changes: 5 additions & 23 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion buildSrc/src/main/java/ProjectProperties.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Original file line number Diff line number Diff line change
@@ -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>
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -21,5 +22,5 @@ interface PointRemoteDataSource {
type: PointType,
)

suspend fun getReason(pointType: PointType): List<PointReason>
suspend fun getReason(type: PointPlace): List<PointReason>
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9ac77de

Please sign in to comment.