github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Change all entities ids from string to int (#167)

Browse Source
This commit is contained in:
Mikołaj Pich
2018-10-20 17:57:24 +02:00
committed by Rafał Borcz
parent 27f6fc7e04
commit f35d9d4b93
35 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
View File

@ -18,5 +18,5 @@ interface AttendanceDao {
fun deleteAll(exams: List<Attendance>)
@Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
fun getExams(diaryId: String, studentId: String, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>
fun getExams(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>
}

2
app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
View File

@ -18,5 +18,5 @@ interface ExamDao {
fun deleteAll(exams: List<Exam>)
@Query("SELECT * FROM Exams WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
fun getExams(diaryId: String, studentId: String, from: LocalDate, end: LocalDate): Maybe<List<Exam>>
fun getExams(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Exam>>
}

2
app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
View File

@ -17,5 +17,5 @@ interface GradeDao {
fun deleteAll(grades: List<Grade>)
@Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
fun getGrades(semesterId: String, studentId: String): Maybe<List<Grade>>
fun getGrades(semesterId: Int, studentId: Int): Maybe<List<Grade>>
}

2
app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
View File

@ -18,5 +18,5 @@ interface GradeSummaryDao {
fun deleteAll(gradesSummary: List<GradeSummary>)
@Query("SELECT * FROM grades_summary WHERE student_id = :studentId AND semester_id = :semesterId")
fun getGradesSummary(semesterId: String, studentId: String): Maybe<List<GradeSummary>>
fun getGradesSummary(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
}

2
app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
View File

@ -13,5 +13,5 @@ interface SemesterDao {
fun insertAll(semester: List<Semester>)
@Query("SELECT * FROM Semesters WHERE student_id = :studentId")
fun getSemester(studentId: String): Single<List<Semester>>
fun getSemester(studentId: Int): Single<List<Semester>>
}

2
app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
View File

@ -18,5 +18,5 @@ interface TimetableDao {
fun deleteAll(exams: List<Timetable>)
@Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
fun getTimetable(diaryId: String, studentId: String, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>
fun getTimetable(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>
}

4
app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
View File

@ -10,10 +10,10 @@ import java.io.Serializable
data class Attendance(
@ColumnInfo(name = "student_id")
var studentId: String,
var studentId: Int,
@ColumnInfo(name = "diary_id")
var diaryId: String,
var diaryId: Int,
var date: LocalDate,

4
app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
View File

@ -10,10 +10,10 @@ import java.io.Serializable
data class Exam(
@ColumnInfo(name = "student_id")
var studentId: String,
var studentId: Int,
@ColumnInfo(name = "diary_id")
var diaryId: String,
var diaryId: Int,
var date: LocalDate,

4
app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
View File

@ -10,10 +10,10 @@ import java.io.Serializable
data class Grade(
@ColumnInfo(name = "semester_id")
var semesterId: String,
var semesterId: Int,
@ColumnInfo(name = "student_id")
var studentId: String,
var studentId: Int,
var subject: String,

4
app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
View File

@ -8,10 +8,10 @@ import android.arch.persistence.room.PrimaryKey
data class GradeSummary(
@ColumnInfo(name = "semester_id")
var semesterId: String,
var semesterId: Int,
@ColumnInfo(name = "student_id")
var studentId: String,
var studentId: Int,
var subject: String,

6
app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
View File

@ -11,16 +11,16 @@ data class Semester(
var id: Long = 0,
@ColumnInfo(name = "student_id")
var studentId: String,
var studentId: Int,
@ColumnInfo(name = "diary_id")
var diaryId: String,
var diaryId: Int,
@ColumnInfo(name = "diary_name")
var diaryName: String,
@ColumnInfo(name = "semester_id")
var semesterId: String,
var semesterId: Int,
@ColumnInfo(name = "semester_name")
var semesterName: Int,

4
app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
View File

@ -21,13 +21,13 @@ data class Student(
var symbol: String = "",
@ColumnInfo(name = "student_id")
var studentId: String = "",
var studentId: Int = 0,
@ColumnInfo(name = "student_name")
var studentName: String = "",
@ColumnInfo(name = "school_id")
var schoolId: String = "",
var schoolSymbol: String = "",
@ColumnInfo(name = "school_name")
var schoolName: String = ""

4
app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
View File

@ -11,10 +11,10 @@ import java.io.Serializable
data class Timetable(
@ColumnInfo(name = "student_id")
var studentId: String,
var studentId: Int,
@ColumnInfo(name = "diary_id")
var diaryId: String,
var diaryId: Int,
val number: Int = 0,

2
app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt
View File

@ -17,7 +17,7 @@ class GradeRemote @Inject constructor(private val api: Api) {
diaryId = semester.diaryId
notifyDataChanged()
}
}).flatMap { api.getGrades(semester.semesterId.toInt()) }
}).flatMap { api.getGrades(semester.semesterId) }
.map { grades ->
grades.map {
Grade(

2
app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt
View File

@ -16,7 +16,7 @@ class GradeSummaryRemote @Inject constructor(private val api: Api) {
diaryId = semester.diaryId
notifyDataChanged()
}
}).flatMap { api.getGradesSummary(semester.semesterId.toInt()) }
}).flatMap { api.getGradesSummary(semester.semesterId) }
.map { gradesSummary ->
gradesSummary.map {
GradeSummary(

8
app/src/main/java/io/github/wulkanowy/data/repositories/remote/SessionRemote.kt
View File

@ -22,7 +22,7 @@ class SessionRemote @Inject constructor(private val api: Api) {
symbol = it.symbol,
studentId = it.studentId,
studentName = it.studentName,
schoolId = it.schoolId,
schoolSymbol = it.schoolSymbol,
schoolName = it.schoolName,
endpoint = endpoint,
loginType = it.loginType.name
@ -40,7 +40,7 @@ class SessionRemote @Inject constructor(private val api: Api) {
studentId = student.studentId,
diaryId = it.diaryId,
diaryName = it.diaryName,
semesterId = it.semesterId.toString(),
semesterId = it.semesterId,
semesterName = it.semesterNumber,
current = it.current
)
@ -51,14 +51,14 @@ class SessionRemote @Inject constructor(private val api: Api) {
}
fun initApi(student: Student, checkInit: Boolean = false) {
if (if (checkInit) api.studentId.isEmpty() else true) {
if (if (checkInit) 0 == api.studentId else true) {
api.run {
email = student.email
password = student.password
symbol = student.symbol
host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
ssl = student.endpoint.startsWith("https")
schoolId = student.schoolId
schoolSymbol = student.schoolSymbol
studentId = student.studentId
loginType = Api.LoginType.valueOf(student.loginType)
notifyDataChanged()

4
app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt
View File

@ -99,11 +99,11 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MenuFragmentView {
presenter.onChildViewRefresh()
}
fun onChildFragmentLoaded(semesterId: String) {
fun onChildFragmentLoaded(semesterId: Int) {
presenter.onChildViewLoaded(semesterId)
}
override fun notifyChildLoadData(index: Int, semesterId: String, forceRefresh: Boolean) {
override fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) {
(childFragmentManager.fragments[index] as GradeView.GradeChildView).onParentLoadData(semesterId, forceRefresh)
}

4
app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt
View File

@ -19,7 +19,7 @@ class GradePresenter @Inject constructor(
private var semesters = emptyList<Semester>()
private val loadedSemesterId = mutableMapOf<Int, String>()
private val loadedSemesterId = mutableMapOf<Int, Int>()
fun onAttachView(view: GradeView, savedIndex: Int?) {
super.onAttachView(view)
@ -55,7 +55,7 @@ class GradePresenter @Inject constructor(
view?.let { loadChild(it.currentPageIndex(), forceRefresh = true) }
}
fun onChildViewLoaded(semesterId: String) {
fun onChildViewLoaded(semesterId: Int) {
view?.apply {
showContent(true)
showProgress(false)

4
app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt
View File

@ -14,7 +14,7 @@ interface GradeView : BaseView {
fun showSemesterDialog(selectedIndex: Int)
fun notifyChildLoadData(index: Int, semesterId: String, forceRefresh: Boolean)
fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)
fun notifyChildParentReselected(index: Int)
@ -24,7 +24,7 @@ interface GradeView : BaseView {
fun onParentChangeSemester()
fun onParentLoadData(semesterId: String, forceRefresh: Boolean)
fun onParentLoadData(semesterId: Int, forceRefresh: Boolean)
fun onParentReselected()
}

4
app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt
View File

@ -102,7 +102,7 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
GradeDetailsDialog.newInstance(grade).show(fragmentManager, grade.toString())
}
override fun onParentLoadData(semesterId: String, forceRefresh: Boolean) {
override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
presenter.onParentViewLoadData(semesterId, forceRefresh)
}
@ -114,7 +114,7 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
presenter.onParentViewChangeSemester()
}
override fun notifyParentDataLoaded(semesterId: String) {
override fun notifyParentDataLoaded(semesterId: Int) {
(parentFragment as? GradeFragment)?.onChildFragmentLoaded(semesterId)
}

2
app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt
View File

@ -22,7 +22,7 @@ class GradeDetailsPresenter @Inject constructor(
view.initView()
}
fun onParentViewLoadData(semesterId: String, forceRefresh: Boolean) {
fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
disposable.add(sessionRepository.getSemesters()
.flatMap { gradeRepository.getGrades(it.first { item -> item.semesterId == semesterId }, forceRefresh) }
.map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }

2
app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt
View File

@ -40,7 +40,7 @@ interface GradeDetailsView : BaseView {
fun weightString(): String
fun notifyParentDataLoaded(semesterId: String)
fun notifyParentDataLoaded(semesterId: Int)
fun notifyParentRefresh()
}

4
app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt
View File

@ -81,7 +81,7 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
gradeSummarySwipe.isRefreshing = show
}
override fun onParentLoadData(semesterId: String, forceRefresh: Boolean) {
override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
presenter.onParentViewLoadData(semesterId, forceRefresh)
}
@ -93,7 +93,7 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
presenter.onParentViewChangeSemester()
}
override fun notifyParentDataLoaded(semesterId: String) {
override fun notifyParentDataLoaded(semesterId: Int) {
(parentFragment as? GradeFragment)?.onChildFragmentLoaded(semesterId)
}

2
app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt
View File

@ -25,7 +25,7 @@ class GradeSummaryPresenter @Inject constructor(
view.initView()
}
fun onParentViewLoadData(semesterId: String, forceRefresh: Boolean) {
fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
disposable.add(sessionRepository.getSemesters()
.map { semester -> semester.first { it.semesterId == semesterId } }
.flatMap {

2
app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt
View File

@ -26,7 +26,7 @@ interface GradeSummaryView : BaseView {
fun finalString(): String
fun notifyParentDataLoaded(semesterId: String)
fun notifyParentDataLoaded(semesterId: Int)
fun notifyParentRefresh()
}