sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Mark as read items older than student registration date (#253)

Browse Source
This commit is contained in:
Mikołaj Pich 2019-02-20 15:34:24 +01:00 committed by Rafał Borcz
parent c365564a77
commit 82d7cf94e8
17 changed files with 83 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt
View File

@ -12,6 +12,7 @@ import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.threeten.bp.LocalDateTime.now
import kotlin.test.assertEquals import kotlin.test.assertEquals
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
@ -39,7 +40,7 @@ class StudentLocalTest {
@Test @Test
fun saveAndReadTest() { fun saveAndReadTest() {
studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, symbol = "")) studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, symbol = "", registrationDate = now()))
.blockingGet() .blockingGet()
val student = studentLocal.getCurrentStudent(true).blockingGet() val student = studentLocal.getCurrentStudent(true).blockingGet()

14
app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
View File

@ -8,6 +8,7 @@ import androidx.room.RoomDatabase.JournalMode.TRUNCATE
import androidx.room.TypeConverters import androidx.room.TypeConverters
import io.github.wulkanowy.data.db.dao.AttendanceDao import io.github.wulkanowy.data.db.dao.AttendanceDao
import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
import io.github.wulkanowy.data.db.dao.ExamDao import io.github.wulkanowy.data.db.dao.ExamDao
import io.github.wulkanowy.data.db.dao.GradeDao import io.github.wulkanowy.data.db.dao.GradeDao
import io.github.wulkanowy.data.db.dao.GradeSummaryDao import io.github.wulkanowy.data.db.dao.GradeSummaryDao
@ -15,13 +16,13 @@ import io.github.wulkanowy.data.db.dao.HomeworkDao
import io.github.wulkanowy.data.db.dao.LuckyNumberDao import io.github.wulkanowy.data.db.dao.LuckyNumberDao
import io.github.wulkanowy.data.db.dao.MessagesDao import io.github.wulkanowy.data.db.dao.MessagesDao
import io.github.wulkanowy.data.db.dao.NoteDao import io.github.wulkanowy.data.db.dao.NoteDao
import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
import io.github.wulkanowy.data.db.dao.SemesterDao import io.github.wulkanowy.data.db.dao.SemesterDao
import io.github.wulkanowy.data.db.dao.StudentDao import io.github.wulkanowy.data.db.dao.StudentDao
import io.github.wulkanowy.data.db.dao.SubjectDao import io.github.wulkanowy.data.db.dao.SubjectDao
import io.github.wulkanowy.data.db.dao.TimetableDao import io.github.wulkanowy.data.db.dao.TimetableDao
import io.github.wulkanowy.data.db.entities.Attendance import io.github.wulkanowy.data.db.entities.Attendance
import io.github.wulkanowy.data.db.entities.AttendanceSummary import io.github.wulkanowy.data.db.entities.AttendanceSummary
import io.github.wulkanowy.data.db.entities.CompletedLesson
import io.github.wulkanowy.data.db.entities.Exam import io.github.wulkanowy.data.db.entities.Exam
import io.github.wulkanowy.data.db.entities.Grade import io.github.wulkanowy.data.db.entities.Grade
import io.github.wulkanowy.data.db.entities.GradeSummary import io.github.wulkanowy.data.db.entities.GradeSummary
@ -29,7 +30,6 @@ import io.github.wulkanowy.data.db.entities.Homework
import io.github.wulkanowy.data.db.entities.LuckyNumber import io.github.wulkanowy.data.db.entities.LuckyNumber
import io.github.wulkanowy.data.db.entities.Message import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.Note import io.github.wulkanowy.data.db.entities.Note
import io.github.wulkanowy.data.db.entities.CompletedLesson
import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.db.entities.Subject import io.github.wulkanowy.data.db.entities.Subject
@ -37,6 +37,7 @@ import io.github.wulkanowy.data.db.entities.Timetable
import io.github.wulkanowy.data.db.migrations.Migration2 import io.github.wulkanowy.data.db.migrations.Migration2
import io.github.wulkanowy.data.db.migrations.Migration3 import io.github.wulkanowy.data.db.migrations.Migration3
import io.github.wulkanowy.data.db.migrations.Migration4 import io.github.wulkanowy.data.db.migrations.Migration4
import io.github.wulkanowy.data.db.migrations.Migration5
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
@ -57,22 +58,25 @@ import javax.inject.Singleton
LuckyNumber::class, LuckyNumber::class,
CompletedLesson::class CompletedLesson::class
], ],
version = 4, version = AppDatabase.VERSION_SCHEMA,
exportSchema = false exportSchema = false
) )
@TypeConverters(Converters::class) @TypeConverters(Converters::class)
abstract class AppDatabase : RoomDatabase() { abstract class AppDatabase : RoomDatabase() {
companion object { companion object {
const val VERSION_SCHEMA = 5
fun newInstance(context: Context): AppDatabase { fun newInstance(context: Context): AppDatabase {
return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database") return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
.setJournalMode(TRUNCATE) .setJournalMode(TRUNCATE)
.fallbackToDestructiveMigrationFrom(5) .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
.fallbackToDestructiveMigrationOnDowngrade() .fallbackToDestructiveMigrationOnDowngrade()
.addMigrations( .addMigrations(
Migration2(), Migration2(),
Migration3(), Migration3(),
Migration4() Migration4(),
Migration5()
) )
.build() .build()
} }

8
app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
View File

@ -25,9 +25,9 @@ interface NoteDao {
@Delete @Delete
fun deleteAll(notes: List<Note>) fun deleteAll(notes: List<Note>)
@Query("SELECT * FROM Notes WHERE semester_id = :semesterId AND student_id = :studentId") @Query("SELECT * FROM Notes WHERE student_id = :studentId")
fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Note>> fun loadAll(studentId: Int): Maybe<List<Note>>
@Query("SELECT * FROM Notes WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId") @Query("SELECT * FROM Notes WHERE is_read = 0 AND student_id = :studentId")
fun loadNew(semesterId: Int, studentId: Int): Maybe<List<Note>> fun loadNew(studentId: Int): Maybe<List<Note>>
} }

3
app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
View File

@ -9,9 +9,6 @@ import java.io.Serializable
@Entity(tableName = "Notes") @Entity(tableName = "Notes")
data class Note( data class Note(
@ColumnInfo(name = "semester_id")
val semesterId: Int,
@ColumnInfo(name = "student_id") @ColumnInfo(name = "student_id")
val studentId: Int, val studentId: Int,

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

@ -4,6 +4,7 @@ import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity
import androidx.room.Index import androidx.room.Index
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
import org.threeten.bp.LocalDateTime
import java.io.Serializable import java.io.Serializable
@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)]) @Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)])
@ -32,7 +33,10 @@ data class Student(
val schoolName: String, val schoolName: String,
@ColumnInfo(name = "is_current") @ColumnInfo(name = "is_current")
val isCurrent: Boolean val isCurrent: Boolean,
@ColumnInfo(name = "registration_date")
val registrationDate: LocalDateTime
) : Serializable { ) : Serializable {
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)

24
app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt Normal file
View File

@ -0,0 +1,24 @@
package io.github.wulkanowy.data.db.migrations
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
import org.threeten.bp.LocalDateTime.now
import org.threeten.bp.ZoneOffset
class Migration5 : Migration(4, 5) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL("ALTER TABLE Students ADD COLUMN `registration_date` INTEGER NOT NULL DEFAULT 0")
database.execSQL("UPDATE Students SET `registration_date` = '${now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()}'")
database.execSQL("DROP TABLE IF EXISTS `Notes`")
database.execSQL("CREATE TABLE IF NOT EXISTS `Notes` (" +
"`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL," +
"`is_read` INTEGER NOT NULL," +
"`is_notified` INTEGER NOT NULL," +
"`student_id` INTEGER NOT NULL," +
"`date` INTEGER NOT NULL," +
"`teacher` TEXT NOT NULL," +
"`category` TEXT NOT NULL," +
"`content` TEXT NOT NULL)")
}
}

9
app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
View File

@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.db.entities.Grade import io.github.wulkanowy.data.db.entities.Grade
import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Single import io.reactivex.Single
import java.net.UnknownHostException import java.net.UnknownHostException
@ -17,7 +18,7 @@ class GradeRepository @Inject constructor(
private val remote: GradeRemote private val remote: GradeRemote
) { ) {
fun getGrades(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> { fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
return local.getGrades(semester).filter { !forceRefresh } return local.getGrades(semester).filter { !forceRefresh }
.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings) .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
.flatMap { .flatMap {
@ -29,8 +30,10 @@ class GradeRepository @Inject constructor(
local.deleteGrades(oldGrades - newGrades) local.deleteGrades(oldGrades - newGrades)
local.saveGrades((newGrades - oldGrades) local.saveGrades((newGrades - oldGrades)
.onEach { .onEach {
if (oldGrades.isNotEmpty()) it.isRead = false if (student.registrationDate <= it.date.atStartOfDay()) {
if (notify) it.isNotified = false if (notify) it.isNotified = false
it.isRead = false
}
}) })
} }
}.flatMap { local.getGrades(semester).toSingle(emptyList()) }) }.flatMap { local.getGrades(semester).toSingle(emptyList()) })

10
app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
View File

@ -2,7 +2,7 @@ package io.github.wulkanowy.data.repositories.note
import io.github.wulkanowy.data.db.dao.NoteDao import io.github.wulkanowy.data.db.dao.NoteDao
import io.github.wulkanowy.data.db.entities.Note import io.github.wulkanowy.data.db.entities.Note
import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Student
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Maybe import io.reactivex.Maybe
import javax.inject.Inject import javax.inject.Inject
@ -11,12 +11,12 @@ import javax.inject.Singleton
@Singleton @Singleton
class NoteLocal @Inject constructor(private val noteDb: NoteDao) { class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
fun getNotes(semester: Semester): Maybe<List<Note>> { fun getNotes(student: Student): Maybe<List<Note>> {
return noteDb.loadAll(semester.semesterId, semester.studentId).filter { !it.isEmpty() } return noteDb.loadAll(student.studentId).filter { !it.isEmpty() }
} }
fun getNewNotes(semester: Semester): Maybe<List<Note>> { fun getNewNotes(student: Student): Maybe<List<Note>> {
return noteDb.loadNew(semester.semesterId, semester.studentId) return noteDb.loadNew(student.studentId)
} }
fun saveNotes(notes: List<Note>) { fun saveNotes(notes: List<Note>) {

1
app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
View File

@ -17,7 +17,6 @@ class NoteRemote @Inject constructor(private val api: Api) {
.map { notes -> .map { notes ->
notes.map { notes.map {
Note( Note(
semesterId = semester.semesterId,
studentId = semester.studentId, studentId = semester.studentId,
date = it.date.toLocalDate(), date = it.date.toLocalDate(),
teacher = it.teacher, teacher = it.teacher,

19
app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
View File

@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.db.entities.Note import io.github.wulkanowy.data.db.entities.Note
import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Single import io.reactivex.Single
import java.net.UnknownHostException import java.net.UnknownHostException
@ -17,27 +18,29 @@ class NoteRepository @Inject constructor(
private val remote: NoteRemote private val remote: NoteRemote
) { ) {
fun getNotes(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> { fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
return local.getNotes(semester).filter { !forceRefresh } return local.getNotes(student).filter { !forceRefresh }
.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings) .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
.flatMap { .flatMap {
if (it) remote.getNotes(semester) if (it) remote.getNotes(semester)
else Single.error(UnknownHostException()) else Single.error(UnknownHostException())
}.flatMap { new -> }.flatMap { new ->
local.getNotes(semester).toSingle(emptyList()) local.getNotes(student).toSingle(emptyList())
.doOnSuccess { old -> .doOnSuccess { old ->
local.deleteNotes(old - new) local.deleteNotes(old - new)
local.saveNotes((new - old) local.saveNotes((new - old)
.onEach { .onEach {
if (notify) it.isNotified = false if (student.registrationDate <= it.date.atStartOfDay()) {
if (notify) it.isNotified = false
it.isRead = false
}
}) })
} }
}.flatMap { local.getNotes(semester).toSingle(emptyList()) } }.flatMap { local.getNotes(student).toSingle(emptyList()) })
)
} }
fun getNewNotes(semester: Semester): Single<List<Note>> { fun getNewNotes(student: Student): Single<List<Note>> {
return local.getNewNotes(semester).toSingle(emptyList()) return local.getNewNotes(student).toSingle(emptyList())
} }
fun updateNote(note: Note): Completable { fun updateNote(note: Note): Completable {

4
app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
View File

@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.student
import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.Api
import io.github.wulkanowy.data.db.entities.Student import io.github.wulkanowy.data.db.entities.Student
import io.reactivex.Single import io.reactivex.Single
import org.threeten.bp.LocalDateTime.now
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@ -22,7 +23,8 @@ class StudentRemote @Inject constructor(private val api: Api) {
schoolName = student.schoolName, schoolName = student.schoolName,
endpoint = endpoint, endpoint = endpoint,
loginType = student.loginType.name, loginType = student.loginType.name,
isCurrent = false isCurrent = false,
registrationDate = now()
) )
} }
} }

5
app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt
View File

@ -101,13 +101,13 @@ class SyncWorker : SimpleJobService() {
.flatMapCompletable { .flatMapCompletable {
Completable.merge( Completable.merge(
listOf( listOf(
gradesDetails.getGrades(it.first, true, notify).ignoreElement(), gradesDetails.getGrades(it.second, it.first, true, notify).ignoreElement(),
gradesSummary.getGradesSummary(it.first, true).ignoreElement(), gradesSummary.getGradesSummary(it.first, true).ignoreElement(),
attendance.getAttendance(it.first, start, end, true).ignoreElement(), attendance.getAttendance(it.first, start, end, true).ignoreElement(),
exam.getExams(it.first, start, end, true).ignoreElement(), exam.getExams(it.first, start, end, true).ignoreElement(),
timetable.getTimetable(it.first, start, end, true).ignoreElement(), timetable.getTimetable(it.first, start, end, true).ignoreElement(),
message.getMessages(it.second, RECEIVED, true, notify).ignoreElement(), message.getMessages(it.second, RECEIVED, true, notify).ignoreElement(),
note.getNotes(it.first, true, notify).ignoreElement(), note.getNotes(it.second, it.first, true, notify).ignoreElement(),
homework.getHomework(it.first, LocalDate.now(), true).ignoreElement(), homework.getHomework(it.first, LocalDate.now(), true).ignoreElement(),
homework.getHomework(it.first, LocalDate.now().plusDays(1), true).ignoreElement(), homework.getHomework(it.first, LocalDate.now().plusDays(1), true).ignoreElement(),
luckyNumber.getLuckyNumber(it.first, true, notify).ignoreElement(), luckyNumber.getLuckyNumber(it.first, true, notify).ignoreElement(),
@ -168,7 +168,6 @@ class SyncWorker : SimpleJobService() {
private fun sendNoteNotification() { private fun sendNoteNotification() {
disposable.add(student.getCurrentStudent() disposable.add(student.getCurrentStudent()
.flatMap { semester.getCurrentSemester(it) }
.flatMap { note.getNewNotes(it) } .flatMap { note.getNewNotes(it) }
.map { it.filter { note -> !note.isNotified } } .map { it.filter { note -> !note.isNotified } }
.doOnSuccess { .doOnSuccess {

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

@ -108,8 +108,8 @@ class GradeDetailsPresenter @Inject constructor(
private fun loadData(semesterId: Int, forceRefresh: Boolean) { private fun loadData(semesterId: Int, forceRefresh: Boolean) {
Timber.i("Loading grade details data started") Timber.i("Loading grade details data started")
disposable.add(studentRepository.getCurrentStudent() disposable.add(studentRepository.getCurrentStudent()
.flatMap { semesterRepository.getSemesters(it) } .flatMap { semesterRepository.getSemesters(it).map { semester -> semester to it } }
.flatMap { gradeRepository.getGrades(it.first { item -> item.semesterId == semesterId }, forceRefresh) } .flatMap { gradeRepository.getGrades(it.second, it.first.first { item -> item.semesterId == semesterId }, forceRefresh) }
.map { it.sortedByDescending { grade -> grade.date } } .map { it.sortedByDescending { grade -> grade.date } }
.map { it.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } } .map { it.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } }
.map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) } .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }

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

@ -36,12 +36,12 @@ class GradeSummaryPresenter @Inject constructor(
fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) { fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
Timber.i("Loading grade summary data started") Timber.i("Loading grade summary data started")
disposable.add(studentRepository.getCurrentStudent() disposable.add(studentRepository.getCurrentStudent()
.flatMap { semesterRepository.getSemesters(it) } .flatMap { semesterRepository.getSemesters(it).map { semester -> semester to it } }
.map { semester -> semester.first { it.semesterId == semesterId } } .map { pair -> pair.first.first { it.semesterId == semesterId } to pair.second }
.flatMap { .flatMap {
gradeSummaryRepository.getGradesSummary(it, forceRefresh) gradeSummaryRepository.getGradesSummary(it.first, forceRefresh)
.flatMap { gradesSummary -> .flatMap { gradesSummary ->
gradeRepository.getGrades(it, forceRefresh) gradeRepository.getGrades(it.second, it.first, forceRefresh)
.map { grades -> .map { grades ->
grades.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } grades.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) }
.groupBy { grade -> grade.subject } .groupBy { grade -> grade.subject }

4
app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
View File

@ -36,8 +36,8 @@ class NotePresenter @Inject constructor(
private fun loadData(forceRefresh: Boolean = false) { private fun loadData(forceRefresh: Boolean = false) {
Timber.i("Loading note data started") Timber.i("Loading note data started")
disposable.add(studentRepository.getCurrentStudent() disposable.add(studentRepository.getCurrentStudent()
.flatMap { semesterRepository.getCurrentSemester(it) } .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
.flatMap { noteRepository.getNotes(it, forceRefresh) } .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
.map { items -> items.map { NoteItem(it) } } .map { items -> items.map { NoteItem(it) } }
.map { items -> items.sortedByDescending { it.note.date } } .map { items -> items.sortedByDescending { it.note.date } }
.subscribeOn(schedulers.backgroundThread) .subscribeOn(schedulers.backgroundThread)

3
app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
View File

@ -16,6 +16,7 @@ import org.mockito.Mockito.never
import org.mockito.Mockito.times import org.mockito.Mockito.times
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations import org.mockito.MockitoAnnotations
import org.threeten.bp.LocalDateTime.now
class LoginFormPresenterTest { class LoginFormPresenterTest {
@ -75,7 +76,7 @@ class LoginFormPresenterTest {
@Test @Test
fun loginTest() { fun loginTest() {
val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, isCurrent = false, symbol = "") val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, isCurrent = false, symbol = "", registrationDate = now())
doReturn(Single.just(listOf(studentTest))) doReturn(Single.just(listOf(studentTest)))
.`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString()) .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
presenter.attemptLogin("@", "123456", "https://fakelog.cf") presenter.attemptLogin("@", "123456", "https://fakelog.cf")

3
app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
View File

@ -16,6 +16,7 @@ import org.mockito.Mockito.clearInvocations
import org.mockito.Mockito.doReturn import org.mockito.Mockito.doReturn
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations import org.mockito.MockitoAnnotations
import org.threeten.bp.LocalDateTime.now
class LoginStudentSelectPresenterTest { class LoginStudentSelectPresenterTest {
@ -36,7 +37,7 @@ class LoginStudentSelectPresenterTest {
private lateinit var presenter: LoginStudentSelectPresenter private lateinit var presenter: LoginStudentSelectPresenter
private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", studentName = "") } private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", studentName = "", registrationDate = now()) }
private val testException by lazy { RuntimeException("Problem") } private val testException by lazy { RuntimeException("Problem") }