Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ALTAPPS-1346: Shared, iOS code blanks support code_blanks_available_conditions #1186

Merged
merged 2 commits into from
Sep 20, 2024
Merged

ALTAPPS-1346: Shared, iOS code blanks support code_blanks_available_conditions #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3180602
Support code_blanks_available_conditions
ivan-magda Sep 20, 2024
c6bb32a
iOS: Fix build
ivan-magda Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...perskillApp/iosHyperskillApp/Sources/Extensions/Shared/Model/BlockOptionsExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ extension Block.Options {
codeBlanksStrings: [String]? = nil,
codeBlanksVariables: [String]? = nil,
codeBlanksOperations: [String]? = nil,
codeBlanksAvailableConditions: Set<String>? = nil,
codeBlanksEnabled: Bool? = nil,
codeBlanksTemplateString: String? = nil
) {
Expand All @@ -28,6 +29,7 @@ extension Block.Options {
codeBlanksStrings: codeBlanksStrings,
codeBlanksVariables: codeBlanksVariables,
codeBlanksOperations: codeBlanksOperations,
codeBlanksAvailableConditions: codeBlanksAvailableConditions,
codeBlanksEnabled: codeBlanksEnabled.flatMap(KotlinBoolean.init(value:)),
codeBlanksTemplateString: codeBlanksTemplateString
)
Expand Down
2 changes: 2 additions & 0 deletions shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Block.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ data class Block(
val codeBlanksVariables: List<String>? = null,
@SerialName("code_blanks_operations")
val codeBlanksOperations: List<String>? = null,
@SerialName("code_blanks_available_conditions")
val codeBlanksAvailableConditions: Set<String>? = null,
@SerialName("code_blanks_enabled")
val codeBlanksEnabled: Boolean? = null,
@SerialName("code_blanks_template")
Expand Down
6 changes: 4 additions & 2 deletions ...rg/hyperskill/app/step_quiz_code_blanks/domain/model/template/CodeBlanksTemplateMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ internal object CodeBlanksTemplateMapper {
indentLevel = entry.indentLevel,
isDeleteForbidden = entry.isDeleteForbidden,
suggestions = StepQuizCodeBlanksResolver.getSuggestionsForBlankCodeBlock(
isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step)
isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step),
availableConditions = step.block.options.codeBlanksAvailableConditions ?: emptySet()
)
)
CodeBlockTemplateEntryType.PRINT ->
Expand Down Expand Up @@ -194,7 +195,8 @@ internal object CodeBlanksTemplateMapper {
indentLevel = 0,
isDeleteForbidden = false,
suggestions = StepQuizCodeBlanksResolver.getSuggestionsForBlankCodeBlock(
isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step)
isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step),
availableConditions = step.block.options.codeBlanksAvailableConditions ?: emptySet()
)
)
)
Expand Down
15 changes: 10 additions & 5 deletions ...kotlin/org/hyperskill/app/step_quiz_code_blanks/presentation/StepQuizCodeBlanksReducer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ class StepQuizCodeBlanksReducer(
index = blankInsertIndex,
indentLevel = blankIndentLevel,
codeBlocks = this,
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable,
availableConditions = state.availableConditions
)
)
)
Expand Down Expand Up @@ -357,7 +358,8 @@ class StepQuizCodeBlanksReducer(
index = activeCodeBlockIndex,
indentLevel = activeCodeBlock.indentLevel,
codeBlocks = this,
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable,
availableConditions = state.availableConditions
)
)
)
Expand Down Expand Up @@ -564,7 +566,8 @@ class StepQuizCodeBlanksReducer(
index = insertIndex,
indentLevel = indentLevel,
codeBlocks = this,
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable,
availableConditions = state.availableConditions
)
)
)
Expand Down Expand Up @@ -699,7 +702,8 @@ class StepQuizCodeBlanksReducer(
index = activeCodeBlockIndex,
indentLevel = newIndentLevel,
codeBlocks = this,
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable
isVariableSuggestionAvailable = state.isVariableSuggestionsAvailable,
availableConditions = state.availableConditions
)
)
else -> activeCodeBlock.updatedIndentLevel(newIndentLevel)
Expand Down Expand Up @@ -749,7 +753,8 @@ class StepQuizCodeBlanksReducer(
isActive = true,
indentLevel = 0,
suggestions = StepQuizCodeBlanksResolver.getSuggestionsForBlankCodeBlock(
isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step)
isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step),
availableConditions = step.block.options.codeBlanksAvailableConditions ?: emptySet()
)
)
)
Expand Down
36 changes: 30 additions & 6 deletions ...otlin/org/hyperskill/app/step_quiz_code_blanks/presentation/StepQuizCodeBlanksResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,33 @@ internal object StepQuizCodeBlanksResolver {
index: Int = -1,
indentLevel: Int = 0,
codeBlocks: List<CodeBlock> = emptyList(),
isVariableSuggestionAvailable: Boolean
isVariableSuggestionAvailable: Boolean,
availableConditions: Set<String>
): List<Suggestion> =
when {
areElifAndElseStatementsSuggestionsAvailable(index, indentLevel, codeBlocks) ->
listOf(Suggestion.Print, Suggestion.Variable, Suggestion.ElifStatement, Suggestion.ElseStatement)
areElifAndElseStatementsSuggestionsAvailable(index, indentLevel, codeBlocks, availableConditions) ->
buildList {
add(Suggestion.Print)
add(Suggestion.Variable)

if (availableConditions.contains(Suggestion.ElifStatement.text)) {
add(Suggestion.ElifStatement)
}

if (availableConditions.contains(Suggestion.ElseStatement.text)) {
add(Suggestion.ElseStatement)
}
}

isVariableSuggestionAvailable ->
listOf(Suggestion.Print, Suggestion.Variable, Suggestion.IfStatement)
buildList {
add(Suggestion.Print)
add(Suggestion.Variable)

if (availableConditions.contains(Suggestion.IfStatement.text)) {
add(Suggestion.IfStatement)
}
}

else ->
listOf(Suggestion.Print)
Expand All @@ -31,9 +50,14 @@ internal object StepQuizCodeBlanksResolver {
fun areElifAndElseStatementsSuggestionsAvailable(
index: Int,
indentLevel: Int,
codeBlocks: List<CodeBlock>
codeBlocks: List<CodeBlock>,
availableConditions: Set<String>
): Boolean {
if (index < MINIMUM_POSSIBLE_INDEX_FOR_ELIF_AND_ELSE_STATEMENTS || codeBlocks.isEmpty()) {
if (
index < MINIMUM_POSSIBLE_INDEX_FOR_ELIF_AND_ELSE_STATEMENTS ||
codeBlocks.isEmpty() ||
availableConditions.isEmpty()
) {
return false
}

Expand Down
3 changes: 3 additions & 0 deletions ...rg/hyperskill/app/step_quiz_code_blanks/presentation/StepQuizCodeBlanksStateExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ internal val StepQuizCodeBlanksFeature.State.isVariableSuggestionsAvailable: Boo
StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(it)
} ?: false

internal val StepQuizCodeBlanksFeature.State.Content.availableConditions: Set<String>
get() = step.block.options.codeBlanksAvailableConditions ?: emptySet()

fun StepQuizCodeBlanksFeature.State.Content.createReply(): Reply =
Reply.code(
code = buildString {
Expand Down
37 changes: 31 additions & 6 deletions ...presentation/StepQuizCodeBlanksReducerElifAndElseStatementsSuggestionsAvailabilityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ import org.hyperskill.app.step_quiz_code_blanks.domain.model.CodeBlock
import org.hyperskill.app.step_quiz_code_blanks.presentation.StepQuizCodeBlanksResolver

class StepQuizCodeBlanksReducerElifAndElseStatementsSuggestionsAvailabilityTest {
companion object {
private val availableConditions = setOf("if", "elif", "else")
}

@Test
fun `Should return false if index is less than 2`() {
val result = StepQuizCodeBlanksResolver.areElifAndElseStatementsSuggestionsAvailable(
index = 1,
indentLevel = 0,
codeBlocks = emptyList()
codeBlocks = emptyList(),
availableConditions = availableConditions
)
assertFalse(result)
}
Expand All @@ -22,7 +27,23 @@ class StepQuizCodeBlanksReducerElifAndElseStatementsSuggestionsAvailabilityTest
val result = StepQuizCodeBlanksResolver.areElifAndElseStatementsSuggestionsAvailable(
index = 2,
indentLevel = 0,
codeBlocks = emptyList()
codeBlocks = emptyList(),
availableConditions = availableConditions
)
assertFalse(result)
}

@Test
fun `Should return false if availableConditions is empty`() {
val codeBlocks = listOf(
CodeBlock.IfStatement(indentLevel = 0, children = emptyList()),
CodeBlock.Print(indentLevel = 1, children = emptyList())
)
val result = StepQuizCodeBlanksResolver.areElifAndElseStatementsSuggestionsAvailable(
index = 2,
indentLevel = 0,
codeBlocks = codeBlocks,
availableConditions = emptySet()
)
assertFalse(result)
}
Expand All @@ -36,7 +57,8 @@ class StepQuizCodeBlanksReducerElifAndElseStatementsSuggestionsAvailabilityTest
val result = StepQuizCodeBlanksResolver.areElifAndElseStatementsSuggestionsAvailable(
index = 2,
indentLevel = 1,
codeBlocks = codeBlocks
codeBlocks = codeBlocks,
availableConditions = availableConditions
)
assertFalse(result)
}
Expand All @@ -50,7 +72,8 @@ class StepQuizCodeBlanksReducerElifAndElseStatementsSuggestionsAvailabilityTest
val result = StepQuizCodeBlanksResolver.areElifAndElseStatementsSuggestionsAvailable(
index = 2,
indentLevel = 0,
codeBlocks = codeBlocks
codeBlocks = codeBlocks,
availableConditions = availableConditions
)
assertTrue(result)
}
Expand All @@ -66,7 +89,8 @@ class StepQuizCodeBlanksReducerElifAndElseStatementsSuggestionsAvailabilityTest
val result = StepQuizCodeBlanksResolver.areElifAndElseStatementsSuggestionsAvailable(
index = 4,
indentLevel = 1,
codeBlocks = codeBlocks
codeBlocks = codeBlocks,
availableConditions = availableConditions
)
assertTrue(result)
}
Expand All @@ -82,7 +106,8 @@ class StepQuizCodeBlanksReducerElifAndElseStatementsSuggestionsAvailabilityTest
val result = StepQuizCodeBlanksResolver.areElifAndElseStatementsSuggestionsAvailable(
index = 4,
indentLevel = 0,
codeBlocks = codeBlocks
codeBlocks = codeBlocks,
availableConditions = availableConditions
)
assertTrue(result)
}
Expand Down
46 changes: 30 additions & 16 deletions .../hyperskill/step_quiz_code_blanks/presentation/StepQuizCodeBlanksReducerInitializeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,42 @@ class StepQuizCodeBlanksReducerInitializeTest {
private val reducer = StepQuizCodeBlanksReducer.stub()

@Test
fun `Initialize should return Content state with active Blank and Print and Variable and If suggestions`() {
val step = Step.stub(
id = 1,
block = Block.stub(options = Block.Options(codeBlanksVariables = listOf("a", "b")))
fun `Initialize should return Content state with active Blank and correct suggestions`() {
val blockOptions = listOf(
Block.Options(codeBlanksVariables = listOf("a", "b")),
Block.Options(
codeBlanksVariables = listOf("a", "b"),
codeBlanksAvailableConditions = setOf("if", "elif", "else")
)
)
val expectedSuggestions = listOf(
listOf(Suggestion.Print, Suggestion.Variable),
listOf(Suggestion.Print, Suggestion.Variable, Suggestion.IfStatement)
)

val message = StepQuizCodeBlanksFeature.InternalMessage.Initialize(step)
val (state, actions) = reducer.reduce(StepQuizCodeBlanksFeature.State.Idle, message)
blockOptions.forEachIndexed { index, options ->
val step = Step.stub(
id = 1,
block = Block.stub(options = options)
)

val expectedState = StepQuizCodeBlanksFeature.State.Content(
step = step,
codeBlocks = listOf(
CodeBlock.Blank(
isActive = true,
suggestions = listOf(Suggestion.Print, Suggestion.Variable, Suggestion.IfStatement)
val message = StepQuizCodeBlanksFeature.InternalMessage.Initialize(step)
val (state, actions) = reducer.reduce(StepQuizCodeBlanksFeature.State.Idle, message)

val expectedState = StepQuizCodeBlanksFeature.State.Content(
step = step,
codeBlocks = listOf(
CodeBlock.Blank(
isActive = true,
suggestions = expectedSuggestions[index]
)
)
)
)

assertTrue(state is StepQuizCodeBlanksFeature.State.Content)
assertEquals(expectedState.codeBlocks, state.codeBlocks)
assertTrue(actions.isEmpty())
assertTrue(state is StepQuizCodeBlanksFeature.State.Content)
assertEquals(expectedState.codeBlocks, state.codeBlocks)
assertTrue(actions.isEmpty())
}
}

@Test
Expand Down
Loading