Fix level filters #711

clockvoid · 2020-02-04T09:56:38Z

Issue

close Level filter does not work correctly? #709

Overview (Required)

rename AudienceCategory to Level
create member level to Session model
create LevelEntity
fix FilterTest
rename AudienceCategory to Level

日本語でこの変更を行った理由と私の思いについて書かせてください．
まず，AudienceCategoryという名前は去年のものだと思いますが，今年はLevelということで，視聴者のレベルではなく，セッションそのもののレベルであり，これは，セッションそのものの特性を指していることから，すべてのAudienceCategoryと名のついたものをLevelという名前に変えさせていただきました．
その際，iOS側のクラスの名前も変わってしまうことになります（なるはずですよね？）が，iOSではまだフィルターは実装されておらず，変更の効く範囲だと思いますので，このようにさせていただきました．
また，セッションのエンティティにlevelsという要素が加わったことにより，キャッシュのデータベースが変更されました．この事により，アプリのストレージをクリアしないとアップデート時に機能しなくなりますが，マイグレーションの処理は書いていません．理由としては，このアプリはまだPlayStoreに上がっておらず，開発段階であり，開発者の皆さまがアプリを再インストールすることで使えるようになるならば，スピード感を優先してマイグレーションはつけなくて良いと判断したためです．
最後に，テストについてです．今回私がいじったのはmodelモジュールですが，このモジュールのjvmTestモジュールはなぜかテストとして認識されていませんでした．model/build.gradleを見ると，jvm()の記述がなかったため，それを追加することによりjvmTestが動くようにしました．また，FilterTestに関しましては，今回の変更ですべてのパターンを調べると18通りとなり，非常に記述が長くなってしまうため，最小限ですべてのパターンを調べることができているように記述したつもりです．

Links

a few files in jvmTest are not recognize dependency libraries. #614

Screenshot

Before	After

I created new Level model because last year's audienceCategory is not not match for this year's response name.

jmatsu-bot · 2020-02-04T10:07:09Z

.../src/main/java/io/github/droidkaigi/confsched2020/data/db/internal/entity/LevelEntityImpl.kt

+import androidx.room.ColumnInfo
+import io.github.droidkaigi.confsched2020.data.db.entity.LevelEntity
+
+internal data class LevelEntityImpl (


🚫 Unexpected spacing before “(“

jmatsu-bot · 2020-02-04T10:07:10Z

...java/io/github/droidkaigi/confsched2020/data/db/internal/entity/mapper/LevelDataMapperExt.kt

@@ -0,0 +1,13 @@
+package io.github.droidkaigi.confsched2020.data.db.internal.entity.mapper
+
+import io.github.droidkaigi.confsched2020.data.db.entity.LevelEntity


🚫 Unused import

jmatsu-bot · 2020-02-04T10:07:10Z

model/src/commonMain/kotlin/io/github/droidkaigi/confsched2020/model/Session.kt

@@ -97,7 +99,7 @@ data class SpeechSession(
    override val isFavorited: Boolean,
    val speakers: List<Speaker>,
    val message: LocaledString?
-) : Session(id, title, desc, dayNumber, startTime, endTime, room, isFavorited), AndroidParcel {
+) : Session(id, title, desc, dayNumber, startTime, endTime, room, isFavorited, levels), AndroidParcel {


🚫 Exceeded max line length (100) (cannot be auto-corrected)

jmatsu-bot · 2020-02-04T10:07:11Z

model/src/commonMain/kotlin/io/github/droidkaigi/confsched2020/model/Session.kt

    val sessionType: SessionType,
    override val isFavorited: Boolean
-) : Session(id, title, desc, dayNumber, startTime, endTime, room, isFavorited), AndroidParcel {
+) : Session(id, title, desc, dayNumber, startTime, endTime, room, isFavorited, levels), AndroidParcel {


🚫 Exceeded max line length (100) (cannot be auto-corrected)

jmatsu-bot · 2020-02-04T10:07:12Z

model/src/jvmTest/kotlin/io/github/droidkaigi/confsched2020/model/FiltersTest.kt

-                    filterItem = setOf(AudienceCategory.BEGINNERS, AudienceCategory.UNSPECIFIED),
-                    isForBeginners = false,
+                Param.forLevels(
+                    title = "filter has Beginners and Intermediate passes Intermediate and Advanced session",


🚫 Exceeded max line length (100) (cannot be auto-corrected)

takahirom · 2020-02-04T10:16:44Z

アプリ内で実態にあった名前を変えるのはいいと思います！！👍👍

jvmの記述がなかったため，それを追加することによりjvmTestが動くようにしました

👍👍👍👍

マイグレーションについてですが、現在マイグレーションが必要になると自動的にDBが破棄される設定になっています！スキーマのバージョンだけ上がっていれば大丈夫です！

clockvoid · 2020-02-04T10:33:42Z

スキーマのバージョンを上げておりませんので，変更します

nashcft · 2020-02-04T11:16:31Z

👍👍👍

jvmTest についてですが、現状CIではテストが実行されていないので、.circleci/config.yml や .github/workflows/on_release_branch.yml のテストを実行している箇所に jvmTest タスクを追加すると良さそうに思いました 👀

clockvoid · 2020-02-04T13:00:06Z

@nashcft
I added jvmTest to .circleci/config.yml like this, but CircleCI's Gradle said No cached version of com.soywiz.korlibs.klock:klock-jvm:1.8.6 available for offline mode..
In my environment, ./gradlew cleanAllTests testDebugUnitTest jvmTest --offline is run and pass correctly. (Of course, I cleaned in advance.)
I am short on experience with CI so, I don't understand why it happens.
Please suggest me some solutions 🙏

clockvoid · 2020-02-04T13:09:45Z

I think we have to create a cache with jvmTest dependencies when caching all of the other structures.
However, I can't find the function of caching dependencies for now...

takahirom · 2020-02-04T13:40:37Z

model/src/commonMain/kotlin/io/github/droidkaigi/confsched2020/model/Level.kt

+package io.github.droidkaigi.confsched2020.model
+
+enum class Level(val rawValue: LocaledString) {
+    BEGINNER(LocaledString("初級", "Beginner")),


I think it is better to have a string such as "BEGINNER" as a property. Level(val id :String, val rawValue: LocaledString) This is because this class is caused by the change of API response. The property name can be id. 👀

I see.
I agree with you. I will fix it!

takahirom · 2020-02-04T13:43:32Z

Thanks! Almost LGTM!

nashcft · 2020-02-04T14:11:40Z

@clockvoid
You're right, we should have cached dependencies for jvmTest but it seems we don't.
Resolving and downloading dependencies are executed here. I'm not sure but it seems that dependencies task doesn't download the listed dependencies unlike androidDependencies (and androidDependenciesExtra, which is extended version defined in this project).

takahirom · 2020-02-04T14:24:11Z

It's better to have a cache, but after the merge. 👍

jmatsu-bot · 2020-02-04T14:24:42Z

No issue was reported. Cool!

Generated by 🚫 Danger

jmatsu-bot · 2020-02-04T14:26:08Z

Your apk has been deployed to https://deploygate.com/distributions/a6778c80b527cb2ca5b5bdc7db3a9bdd2418dacc. Anyone can try your changes via the link.

Generated by 🚫 Danger

nashcft · 2020-02-04T14:31:26Z

@takahirom
I think it's OK but we have to remove jvmTest task from CircleCI workflow before merge because no test is executed in this branch now.

takahirom · 2020-02-04T14:42:56Z

It's a problem that the test doesn't run, but on another branch, we seem to have a problem with CI testing. 👀 ( #671 )
#714 (comment)

nashcft · 2020-02-04T15:37:52Z

I see. Thanks for the information 🙏

clockvoid added 12 commits February 4, 2020 17:58

add: level model

2faefe2

I created new Level model because last year's audienceCategory is not not match for this year's response name.

add: mappers for Level model

7289073

add: entities for Level model

13fe0c5

add: level data to session entity

847b15b

add: level to response deata

ec206ad

fix: session and sessioncontent

14720ff

fix: filters and view structures

dab4b00

fix: sessionsviewmodeltest

d196a64

fix: model/gradle.gradle to recognize jvmTest

96af70a

fix: FiltersTest to fit 2020 version

225c1fa

delete: audiencecategory

ed29c8d

rename: all of audiencecategory to level

fc74d09

jmatsu-bot reviewed Feb 4, 2020

View reviewed changes

fix: things reported by ktlint

86db89b

clockvoid added 2 commits February 4, 2020 21:28

add: jvmTest to circleci and github workflow's on release

66169e2

update: database scheme version from 17 to 18

f671cc5

takahirom reviewed Feb 4, 2020

View reviewed changes

clockvoid added 2 commits February 4, 2020 23:20

delete: unrelated newline

1643783

add: id member in Level enum class and apply it

c026d5e

takahirom merged commit 6080733 into DroidKaigi:master Feb 4, 2020

clockvoid mentioned this pull request Feb 5, 2020

a few files in jvmTest are not recognize dependency libraries. #614

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix level filters #711

Fix level filters #711

clockvoid commented Feb 4, 2020

jmatsu-bot Feb 4, 2020

jmatsu-bot Feb 4, 2020

jmatsu-bot Feb 4, 2020

jmatsu-bot Feb 4, 2020

jmatsu-bot Feb 4, 2020

takahirom commented Feb 4, 2020

clockvoid commented Feb 4, 2020

nashcft commented Feb 4, 2020

clockvoid commented Feb 4, 2020

clockvoid commented Feb 4, 2020 •

edited

Loading

takahirom Feb 4, 2020 •

edited

Loading

clockvoid Feb 4, 2020

takahirom commented Feb 4, 2020

nashcft commented Feb 4, 2020

takahirom commented Feb 4, 2020

jmatsu-bot commented Feb 4, 2020

jmatsu-bot commented Feb 4, 2020

nashcft commented Feb 4, 2020 •

edited

Loading

takahirom commented Feb 4, 2020

nashcft commented Feb 4, 2020

		@@ -0,0 +1,13 @@
		package io.github.droidkaigi.confsched2020.data.db.internal.entity.mapper

		import io.github.droidkaigi.confsched2020.data.db.entity.LevelEntity

Fix level filters #711

Fix level filters #711

Conversation

clockvoid commented Feb 4, 2020

Issue

Overview (Required)

Links

Screenshot

jmatsu-bot Feb 4, 2020

Choose a reason for hiding this comment

jmatsu-bot Feb 4, 2020

Choose a reason for hiding this comment

jmatsu-bot Feb 4, 2020

Choose a reason for hiding this comment

jmatsu-bot Feb 4, 2020

Choose a reason for hiding this comment

jmatsu-bot Feb 4, 2020

Choose a reason for hiding this comment

takahirom commented Feb 4, 2020

clockvoid commented Feb 4, 2020

nashcft commented Feb 4, 2020

clockvoid commented Feb 4, 2020

clockvoid commented Feb 4, 2020 • edited Loading

takahirom Feb 4, 2020 • edited Loading

Choose a reason for hiding this comment

clockvoid Feb 4, 2020

Choose a reason for hiding this comment

takahirom commented Feb 4, 2020

nashcft commented Feb 4, 2020

takahirom commented Feb 4, 2020

jmatsu-bot commented Feb 4, 2020

jmatsu-bot commented Feb 4, 2020

nashcft commented Feb 4, 2020 • edited Loading

takahirom commented Feb 4, 2020

nashcft commented Feb 4, 2020

clockvoid commented Feb 4, 2020 •

edited

Loading

takahirom Feb 4, 2020 •

edited

Loading

nashcft commented Feb 4, 2020 •

edited

Loading