Merge pull request #954 from StepicOrg/release/1.211

Release/1.211

Author: rostikjoystick

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

@@ -61,6 +61,7 @@ constructor(
             isFavorite = cursor.getBoolean(DbStructureCourse.Columns.IS_FAVORITE),
             isProctored = cursor.getBoolean(DbStructureCourse.Columns.IS_PROCTORED),
             isInWishlist = cursor.getBoolean(DbStructureCourse.Columns.IS_IN_WISHLIST),
+            isEnabled = cursor.getBoolean(DbStructureCourse.Columns.IS_ENABLED),
             certificateDistinctionThreshold = cursor.getLong(DbStructureCourse.Columns.CERTIFICATE_DISTINCTION_THRESHOLD),
             certificateRegularThreshold = cursor.getLong(DbStructureCourse.Columns.CERTIFICATE_REGULAR_THRESHOLD),
             certificateLink = cursor.getString(DbStructureCourse.Columns.CERTIFICATE_LINK),
@@ -132,6 +133,7 @@ constructor(
         values.put(DbStructureCourse.Columns.IS_FAVORITE, course.isFavorite)
         values.put(DbStructureCourse.Columns.IS_PROCTORED, course.isProctored)
         values.put(DbStructureCourse.Columns.IS_IN_WISHLIST, course.isInWishlist)
+        values.put(DbStructureCourse.Columns.IS_ENABLED, course.isEnabled)
         values.put(DbStructureCourse.Columns.CERTIFICATE_DISTINCTION_THRESHOLD, course.certificateDistinctionThreshold)
         values.put(DbStructureCourse.Columns.CERTIFICATE_REGULAR_THRESHOLD, course.certificateRegularThreshold)
         values.put(DbStructureCourse.Columns.CERTIFICATE_LINK, course.certificateLink)

app/src/main/java/org/stepic/droid/storage/migration/MigrationFrom80To81.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 MigrationFrom80To81 : Migration(80, 81) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE ${DbStructureCourse.TABLE_NAME} ADD COLUMN ${DbStructureCourse.Columns.IS_ENABLED} INTEGER")
+    }
+}

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

@@ -211,6 +211,7 @@ object Migrations {
         MigrationFrom76To77,
         MigrationFrom77To78,
         MigrationFrom78To79,
-        MigrationFrom79To80
+        MigrationFrom79To80,
+        MigrationFrom80To81
     )
 }

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

@@ -46,6 +46,7 @@ object DbStructureCourse {
         const val IS_ARCHIVED = "is_archived"
         const val IS_FAVORITE = "is_favorite"
         const val IS_IN_WISHLIST = "is_in_wishlist"
+        const val IS_ENABLED = "is_enabled"
 
         const val CERTIFICATE_DISTINCTION_THRESHOLD = "certificate_distinction_threshold"
         const val CERTIFICATE_REGULAR_THRESHOLD = "certificate_regular_threshold"

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

@@ -5,4 +5,5 @@ import org.stepik.android.model.Course
 val Course.canContinue: Boolean
     get() = totalUnits != 0L
             && scheduleType != Course.SCHEDULE_TYPE_UPCOMMING
-            && scheduleType != Course.SCHEDULE_TYPE_ENDED
+            && scheduleType != Course.SCHEDULE_TYPE_ENDED
+            && (isEnabled || actions?.editCourse == null)

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

@@ -14,6 +14,7 @@ object DateTimeHelper {
 
     const val DISPLAY_MONTH_YEAR_NOMINAL_PATTERN = "LLLL yyyy"
     const val DISPLAY_MONTH_YEAR_GENITIVE_PATTERN = "MMMM yyyy"
+    const val DISPLAY_DAY_MONTH_YEAR_GENITIVE_PATTERN = "dd MMMM yyyy"
 
     const val ISO_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZ"
     private val millisecondsInHour = 1000 * 60 * 60

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 = 80
+        const val VERSION = 81
         const val NAME = "stepic_database.db"
     }
 

app/src/main/java/org/stepik/android/domain/course/interactor/CourseInteractor.kt

@@ -120,7 +120,7 @@ constructor(
                         ?.let { CoursePurchaseDataResult.Result(it) }
                         ?: CoursePurchaseDataResult.Empty
 
-                is EnrollmentState.NotEnrolledUnavailable ->
+                is EnrollmentState.NotEnrolledUnavailableIAP ->
                     CoursePurchaseDataResult.NotAvailable
 
                 else ->

app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt

@@ -114,6 +114,9 @@ constructor(
             course.enrollment > 0 ->
                 profileRepository.getProfile().map { profile -> course.id to resolveEnrolledEnrollmentState(course, profile.id) }
 
+            course.scheduleType == Course.SCHEDULE_TYPE_ENDED ->
+                Single.just(course.id to EnrollmentState.NotEnrolledEnded)
+
             !course.isPaid ->
                 Single.just(course.id to EnrollmentState.NotEnrolledFree)
 
@@ -122,7 +125,11 @@ constructor(
                     .getCoursePaymentsByCourseId(course.id, coursePaymentStatus = CoursePayment.Status.SUCCESS, sourceType = sourceType)
                     .flatMap { payments ->
                         if (payments.isEmpty()) {
-                            Single.just(course.id to EnrollmentState.NotEnrolledWeb)
+                            if (course.actions?.courseBuyAction?.enabled == true) {
+                                Single.just(course.id to EnrollmentState.NotEnrolledWeb) // web
+                            } else {
+                                Single.just(course.id to EnrollmentState.NotEnrolledCantBeBought)
+                            }
                         } else {
                             Single.just(course.id to EnrollmentState.NotEnrolledFree)
                         }
@@ -193,6 +200,9 @@ constructor(
             !course.isPaid ->
                 Single.just(EnrollmentState.NotEnrolledFree)
 
+            course.scheduleType == Course.SCHEDULE_TYPE_ENDED ->
+                Single.just(EnrollmentState.NotEnrolledEnded)
+
             course.isPaid -> {
                 val (standardLightSku, promoLightSku) = course.let {
                     val currentMobileTier = mobileTiersByCourseId[it.id]
@@ -203,7 +213,11 @@ constructor(
                         .getCoursePaymentsByCourseId(course.id, coursePaymentStatus = CoursePayment.Status.SUCCESS, sourceType = sourceType)
                         .flatMap { payments ->
                             if (payments.isEmpty()) {
-                                Single.just(resolvePaidEnrollmentState(standardLightSku, promoLightSku))
+                                if (course.actions?.courseBuyAction?.enabled == true) {
+                                    Single.just(resolvePaidEnrollmentState(standardLightSku, promoLightSku))
+                                } else {
+                                    Single.just(EnrollmentState.NotEnrolledCantBeBought)
+                                }
                             } else {
                                 Single.just(EnrollmentState.NotEnrolledFree)
                             }
@@ -242,7 +256,7 @@ constructor(
              * through the application
              */
             if (currentFlow == CoursePurchaseFlow.IAP) {
-                EnrollmentState.NotEnrolledUnavailable
+                EnrollmentState.NotEnrolledUnavailableIAP
             } else {
                 EnrollmentState.NotEnrolledWeb
             }

app/src/main/java/org/stepik/android/domain/course/model/EnrollmentState.kt

@@ -18,8 +18,17 @@ sealed class EnrollmentState : Parcelable {
     @Parcelize
     object NotEnrolledWeb : EnrollmentState()
 
+    /**
+     * Course cannot be purchased via IAP
+     */
     @Parcelize
-    object NotEnrolledUnavailable : EnrollmentState()
+    object NotEnrolledUnavailableIAP : EnrollmentState()
+
+    @Parcelize
+    object NotEnrolledEnded : EnrollmentState()
+
+    @Parcelize
+    object NotEnrolledCantBeBought : EnrollmentState()
 
     @Parcelize
     object Pending : EnrollmentState()