Skip to content

Adds flags for enabling new assessment students wrote flag logic #553

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

Merged
cditcher merged 1 commit into from
Dec 18, 2025
Merged

Adds flags for enabling new assessment students wrote flag logic #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/AssessmentRegistrationsRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import ca.bc.gov.educ.api.ruleengine.dto.RuleData;
import ca.bc.gov.educ.api.ruleengine.dto.RuleProcessorData;
import ca.bc.gov.educ.api.ruleengine.dto.StudentAssessment;
import ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants;
import ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiUtils;
import ca.bc.gov.educ.api.ruleengine.util.RuleProcessorRuleUtils;
import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -37,15 +38,15 @@ public RuleData fire() {
for (StudentAssessment studentAssessment : studentAssessmentList) {
String specialCase = StringUtils.isBlank(studentAssessment.getSpecialCase())? "" : studentAssessment.getSpecialCase();
String wroteFlag = StringUtils.isBlank(studentAssessment.getWroteFlag())? "" : studentAssessment.getWroteFlag();
/*if(constants.isEnableV2Changes()) {
if(RuleEngineApiConstants.isEnableV2Changes()) {
if ("".compareTo(specialCase.trim()) == 0 && "N".compareTo(wroteFlag.trim()) == 0) {
studentAssessment.setProjected(true);
}
} else {*/
} else {
if ("".compareTo(specialCase.trim()) == 0 && "".compareTo(wroteFlag.trim()) == 0) {
studentAssessment.setProjected(true);
}
//}
}
}

ruleProcessorData.setExcludedAssessments(RuleProcessorRuleUtils.maintainExcludedAssessments(studentAssessmentList,ruleProcessorData.getExcludedAssessments(),ruleProcessorData.isProjected()));
Expand Down
7 changes: 4 additions & 3 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/IncompleteAssessmentsRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import ca.bc.gov.educ.api.ruleengine.dto.RuleData;
import ca.bc.gov.educ.api.ruleengine.dto.RuleProcessorData;
import ca.bc.gov.educ.api.ruleengine.dto.StudentAssessment;
import ca.bc.gov.educ.api.ruleengine.util.RuleEngineApiConstants;
import ca.bc.gov.educ.api.ruleengine.util.RuleProcessorRuleUtils;
import lombok.AllArgsConstructor;
import lombok.Data;
Expand Down Expand Up @@ -31,16 +32,16 @@ public RuleData fire() {

for (StudentAssessment studentAssessment : studentAssessmentList) {
String specialCase = StringUtils.isBlank(studentAssessment.getSpecialCase())? "" : studentAssessment.getSpecialCase();
/*if(false) {
if(RuleEngineApiConstants.isEnableV2Changes()) {
if ("".compareTo(specialCase.trim()) == 0 && studentAssessment.isDidNotAttemptFlag()) {
studentAssessment.setNotCompleted(true);
}
} else {*/
} else {
String wroteFlag = StringUtils.isBlank(studentAssessment.getWroteFlag())? "" : studentAssessment.getWroteFlag();
if ("".compareTo(specialCase.trim()) == 0 && "N".compareTo(wroteFlag.trim()) == 0) {
studentAssessment.setNotCompleted(true);
}
//}
}
}

ruleProcessorData.setExcludedAssessments(RuleProcessorRuleUtils.maintainExcludedAssessments(studentAssessmentList,ruleProcessorData.getExcludedAssessments(),ruleProcessorData.isProjected()));
Expand Down
15 changes: 15 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/util/RuleEngineApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package ca.bc.gov.educ.api.ruleengine.util;

import jakarta.annotation.PostConstruct;
import lombok.Getter;
import lombok.Setter;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -43,4 +44,18 @@ public class RuleEngineApiConstants {

@Value("${enable-v2-changes}")
private boolean enableV2Changes;

private static RuleEngineApiConstants instance;

@PostConstruct
public void init() {
instance = this;
}

public static boolean isEnableV2Changes() {
if (instance == null) {
throw new IllegalStateException("RuleEngineApiConstants not initialized");
}
return instance.enableV2Changes;
}
}
8 changes: 8 additions & 0 deletions tools/config/update-configmap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ PARSER_CONFIG="
###########################################################
#Setup for config-maps
###########################################################

if [ "$envValue" == "prod" ]
then
ENABLE_V2_CHANGES="false"
else
ENABLE_V2_CHANGES="true"
fi

echo Creating config map "$APP_NAME"-config-map
oc create -n "$BUSINESS_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map \
--from-literal=APP_LOG_LEVEL="$APP_LOG_LEVEL" \
Expand Down
Loading