Merge pull request #948 from StepicOrg/release/1.209

Release/1.209

Author: rostikjoystick

app/src/main/assets/css/wysiwyg.css

@@ -43,6 +43,7 @@
   img {
     display: block;
     max-width: 100%;
+    height: auto;
     &.wysiwyg-float-left,
     &.wysiwyg-float-right {
       display: inline-block;

app/src/main/java/org/stepic/droid/storage/dao/CourseDaoImpl.kt

@@ -30,6 +30,7 @@ constructor(
             title = cursor.getString(DbStructureCourse.Columns.TITLE),
             description = cursor.getString(DbStructureCourse.Columns.DESCRIPTION),
             cover = cursor.getString(DbStructureCourse.Columns.COVER),
+            acquiredSkills = DbParseHelper.parseStringToStringList(cursor.getString(DbStructureCourse.Columns.ACQUIRED_SKILLS)),
             certificate = cursor.getString(DbStructureCourse.Columns.CERTIFICATE),
             requirements = cursor.getString(DbStructureCourse.Columns.REQUIREMENTS),
             summary = cursor.getString(DbStructureCourse.Columns.SUMMARY),
@@ -100,6 +101,7 @@ constructor(
         values.put(DbStructureCourse.Columns.TITLE, course.title)
         values.put(DbStructureCourse.Columns.DESCRIPTION, course.description)
         values.put(DbStructureCourse.Columns.COVER, course.cover)
+        values.put(DbStructureCourse.Columns.ACQUIRED_SKILLS, DbParseHelper.parseStringArrayToString(course.acquiredSkills?.toTypedArray()))
         values.put(DbStructureCourse.Columns.CERTIFICATE, course.certificate)
         values.put(DbStructureCourse.Columns.REQUIREMENTS, course.requirements)
         values.put(DbStructureCourse.Columns.SUMMARY, course.summary)

app/src/main/java/org/stepic/droid/storage/migration/MigrationFrom79To80.kt

@@ -0,0 +1,11 @@
+package org.stepic.droid.storage.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.stepic.droid.storage.structure.DbStructureCourse
+
+object MigrationFrom79To80 : Migration(79, 80) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE ${DbStructureCourse.TABLE_NAME} ADD COLUMN ${DbStructureCourse.Columns.ACQUIRED_SKILLS} TEXT")
+    }
+}

app/src/main/java/org/stepic/droid/storage/migration/Migrations.kt

@@ -210,6 +210,7 @@ object Migrations {
         MigrationFrom75To76,
         MigrationFrom76To77,
         MigrationFrom77To78,
-        MigrationFrom78To79
+        MigrationFrom78To79,
+        MigrationFrom79To80
     )
 }

app/src/main/java/org/stepic/droid/storage/structure/DbStructureCourse.kt

@@ -10,6 +10,7 @@ object DbStructureCourse {
         const val TITLE = "title"
         const val DESCRIPTION = "description"
         const val COVER = "cover"
+        const val ACQUIRED_SKILLS = "acquired_skills"
         const val CERTIFICATE = "certificate"
 
         const val REQUIREMENTS = "requirements"

app/src/main/java/org/stepic/droid/util/DateTimeHelper.kt

@@ -9,6 +9,7 @@ import java.util.TimeZone
 
 object DateTimeHelper {
     const val DISPLAY_DATETIME_PATTERN = "dd MMMM yyyy HH:mm"
+    const val DISPLAY_DATETIME_COMMA_PATTERN = "dd MMMM yyyy, HH:mm"
     const val DISPLAY_DAY_MONTH_PATTERN = "dd MMMM"
 
     const val DISPLAY_MONTH_YEAR_NOMINAL_PATTERN = "LLLL yyyy"

app/src/main/java/org/stepik/android/cache/base/database/AppDatabase.kt

@@ -68,7 +68,7 @@ import org.stepik.android.domain.wishlist.model.WishlistEntry
 )
 abstract class AppDatabase : RoomDatabase() {
     companion object {
-        const val VERSION = 79
+        const val VERSION = 80
         const val NAME = "stepic_database.db"
     }
 

app/src/main/java/org/stepik/android/data/announcement/repository/AnnouncementRepositoryImpl.kt

@@ -23,5 +23,5 @@ constructor(
         )
 
     override fun getAnnouncements(announcementIds: List<Long>, sourceType: DataSourceType): Single<List<Announcement>> =
-        delegate.get(announcementIds, sourceType, allowFallback = true)
+        delegate.get(announcementIds, sourceType, allowFallback = false)
 }

app/src/main/java/org/stepik/android/domain/announcement/model/Announcement.kt

@@ -26,7 +26,7 @@ data class Announcement(
     @SerializedName("sent_date")
     val sentDate: Date?,
     @SerializedName("status")
-    val status: String,
+    val status: AnnouncementStatus,
     @SerializedName("is_restricted_by_score")
     val isRestrictedByScore: Boolean,
     @SerializedName("score_percent_min")
@@ -63,4 +63,33 @@ data class Announcement(
     val estimatedFinishDate: Date?,
     @SerializedName("notice_dates")
     val noticeDates: List<Date> = emptyList()
-) : Identifiable<Long>
+) : Identifiable<Long> {
+    enum class AnnouncementStatus(val status: String) {
+        @SerializedName("composing")
+        COMPOSING("composing"),
+
+        @SerializedName("scheduled")
+        SCHEDULED("scheduled"),
+
+        @SerializedName("queueing")
+        QUEUEING("queueing"),
+
+        @SerializedName("queued")
+        QUEUED("queued"),
+
+        @SerializedName("sending")
+        SENDING("sending"),
+
+        @SerializedName("sent")
+        SENT("sent"),
+
+        @SerializedName("aborted")
+        ABORTED("aborted")
+    }
+
+    val displayedStartDate: Date?
+        get() = this.estimatedStartDate ?: this.startDate
+
+    val displayedFinishDate: Date?
+        get() = this.estimatedFinishDate ?: this.sentDate
+}

app/src/main/java/org/stepik/android/domain/course_info/interactor/CourseInfoInteractor.kt

@@ -1,7 +1,6 @@
 package org.stepik.android.domain.course_info.interactor
 
 import io.reactivex.Observable
-import io.reactivex.rxkotlin.Singles.zip
 import org.stepik.android.domain.course_info.model.CourseInfoData
 import org.stepik.android.domain.user.repository.UserRepository
 import org.stepik.android.model.Course
@@ -22,24 +21,32 @@ constructor(
     private fun getCourseInfoUsers(course: Course): Observable<CourseInfoData> {
         val emptySource = Observable.just(mapToCourseInfoData(course))
 
-        val instructorsSource = userRepository.getUsers(userIds = course.instructors ?: listOf())
-        val ownerSource = userRepository.getUsers(listOf(course.owner))
+        val authorIds = course.authors ?: emptyList()
+        val instructorIds = course.instructors ?: emptyList()
+        val combinedUserIds = (authorIds + instructorIds).distinct()
 
         val remoteSource =
-            zip(instructorsSource, ownerSource) { instructors, owners ->
-                mapToCourseInfoData(course, instructors, owners.firstOrNull())
+            userRepository.getUsers(userIds = combinedUserIds).map { users ->
+                val usersById = users.associateBy(User::id)
+                val filteredAuthorIds = authorIds - instructorIds
+
+                val filteredAuthors = filteredAuthorIds.mapNotNull { usersById[it] }
+                val instructors = instructorIds.mapNotNull { usersById[it] }
+                mapToCourseInfoData(course, filteredAuthors, instructors)
             }
 
         return emptySource
             .concatWith(remoteSource.toObservable())
             .onErrorReturn {
-                mapToCourseInfoData(course, instructors = emptyList()) // fallback on network error
+                mapToCourseInfoData(course, authors = emptyList(), instructors = emptyList()) // fallback on network error
             }
     }
 
-    private fun mapToCourseInfoData(course: Course, instructors: List<User>? = null, organization: User? = null): CourseInfoData =
+    private fun mapToCourseInfoData(course: Course, authors: List<User>? = null, instructors: List<User>? = null): CourseInfoData =
         CourseInfoData(
-            organization   = organization?.takeIf(User::isOrganization),
+            summary        = course.summary?.takeIf(String::isNotBlank),
+            authors        = (authors ?: calculateAuthorIds(course).map { null }).takeIf { it.isNotEmpty() },
+            acquiredSkills = course.acquiredSkills,
             videoMediaData = course.introVideo
                 ?.takeUnless { it.urls.isNullOrEmpty() }
                 ?.let { video ->
@@ -66,4 +73,7 @@ constructor(
                 },
             learnersCount = course.learnersCount
         )
+
+    private fun calculateAuthorIds(course: Course): List<Long> =
+        (course.authors ?: emptyList()) - (course.instructors ?: emptyList())
 }