Skip to content

Commit 47f77d3

Browse files
Steph0Steph0
authored
♻️ api: continueOnError had absolutely no effect on code
1 parent 4c6931e commit 47f77d3

File tree

2 files changed

+8
-48
lines changed

2 files changed

+8
-48
lines changed

‎api/src/certification/evaluation/domain/services/scoring/scoring-v2.js

+7-25
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ export const handleV2CertificationScoring = async ({
5454
}) => {
5555
const certificationAssessmentScore = await dependencies.calculateCertificationAssessmentScore({
5656
certificationAssessment,
57-
continueOnError: false,
5857
areaRepository,
5958
placementProfileService,
6059
scoringService,
@@ -86,12 +85,10 @@ export const handleV2CertificationScoring = async ({
8685
/**
8786
* @param {Object} params
8887
* @param {CertificationAssessment} params.certificationAssessment
89-
* @param {boolean} params.continueOnError
9088
* @param {ScoringService} params.dependencies.scoringService
9189
*/
9290
export const calculateCertificationAssessmentScore = async function ({
9391
certificationAssessment,
94-
continueOnError,
9592
areaRepository,
9693
placementProfileService,
9794
scoringService,
@@ -114,14 +111,7 @@ export const calculateCertificationAssessmentScore = async function ({
114111
);
115112

116113
const allAreas = await areaRepository.list();
117-
return _getResult(
118-
matchingAnswers,
119-
matchingCertificationChallenges,
120-
testedCompetences,
121-
allAreas,
122-
continueOnError,
123-
scoringService,
124-
);
114+
return _getResult(matchingAnswers, matchingCertificationChallenges, testedCompetences, allAreas, scoringService);
125115
};
126116

127117
/**
@@ -156,7 +146,6 @@ function _getCompetenceMarksWithCertifiedLevelAndScore(
156146
listCompetences,
157147
reproducibilityRate,
158148
certificationChallenges,
159-
continueOnError,
160149
answerCollection,
161150
allAreas,
162151
scoringService,
@@ -165,11 +154,9 @@ function _getCompetenceMarksWithCertifiedLevelAndScore(
165154
const challengesForCompetence = _.filter(certificationChallenges, { competenceId: competence.id });
166155
const answersForCompetence = _selectAnswersMatchingCertificationChallenges(answers, challengesForCompetence);
167156

168-
if (!continueOnError) {
169-
CertificationContract.assertThatCompetenceHasAtLeastOneChallenge(challengesForCompetence, competence.index);
170-
CertificationContract.assertThatEveryAnswerHasMatchingChallenge(answersForCompetence, challengesForCompetence);
171-
CertificationContract.assertThatNoChallengeHasMoreThanOneAnswer(answersForCompetence, challengesForCompetence);
172-
}
157+
CertificationContract.assertThatCompetenceHasAtLeastOneChallenge(challengesForCompetence, competence.index);
158+
CertificationContract.assertThatEveryAnswerHasMatchingChallenge(answersForCompetence, challengesForCompetence);
159+
CertificationContract.assertThatNoChallengeHasMoreThanOneAnswer(answersForCompetence, challengesForCompetence);
173160

174161
const certifiedLevel = CertifiedLevel.from({
175162
numberOfChallenges: answerCollection.numberOfChallengesForCompetence(competence.id),
@@ -209,10 +196,8 @@ function _getCompetenceMarksWithFailedLevel(listCompetences, allAreas, scoringSe
209196
/**
210197
* @param {ScoringService} scoringService
211198
*/
212-
function _getResult(answers, certificationChallenges, testedCompetences, allAreas, continueOnError, scoringService) {
213-
if (!continueOnError) {
214-
CertificationContract.assertThatWeHaveEnoughAnswers(answers, certificationChallenges);
215-
}
199+
function _getResult(answers, certificationChallenges, testedCompetences, allAreas, scoringService) {
200+
CertificationContract.assertThatWeHaveEnoughAnswers(answers, certificationChallenges);
216201

217202
const answerCollection = AnswerCollectionForScoring.from({ answers, challenges: certificationChallenges });
218203

@@ -240,16 +225,13 @@ function _getResult(answers, certificationChallenges, testedCompetences, allArea
240225
testedCompetences,
241226
reproducibilityRate.value,
242227
certificationChallenges,
243-
continueOnError,
244228
answerCollection,
245229
allAreas,
246230
scoringService,
247231
);
248232
const scoreAfterRating = _getSumScoreFromCertifiedCompetences(competenceMarks);
249233

250-
if (!continueOnError) {
251-
CertificationContract.assertThatScoreIsCoherentWithReproducibilityRate(scoreAfterRating, reproducibilityRate.value);
252-
}
234+
CertificationContract.assertThatScoreIsCoherentWithReproducibilityRate(scoreAfterRating, reproducibilityRate.value);
253235

254236
return new CertificationAssessmentScore({
255237
competenceMarks,

‎api/tests/certification/evaluation/unit/domain/services/scoring/scoring-v2_test.js

+1-23
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
979979
// when
980980
const error = await catchErr(calculateCertificationAssessmentScore)({
981981
certificationAssessment,
982-
continueOnError: false,
983982
areaRepository,
984983
placementProfileService,
985984
scoringService,
@@ -1032,7 +1031,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
10321031
const error = await catchErr(calculateCertificationAssessmentScore)({
10331032
candidate,
10341033
certificationAssessment,
1035-
continueOnError: false,
10361034
areaRepository,
10371035
placementProfileService,
10381036
scoringService,
@@ -1147,7 +1145,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
11471145
const error = await catchErr(calculateCertificationAssessmentScore)({
11481146
candidate,
11491147
certificationAssessment,
1150-
continueOnError: false,
11511148
areaRepository,
11521149
placementProfileService,
11531150
scoringService,
@@ -1159,8 +1156,7 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
11591156
});
11601157
});
11611158

1162-
context('Compute certification result for jury (continue on error)', function () {
1163-
const continueOnError = true;
1159+
context('Compute certification result for jury', function () {
11641160
let placementProfileService;
11651161
beforeEach(function () {
11661162
certificationAssessment = domainBuilder.buildCertificationAssessment({
@@ -1185,7 +1181,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
11851181
// when
11861182
await calculateCertificationAssessmentScore({
11871183
certificationAssessment,
1188-
continueOnError,
11891184
areaRepository,
11901185
placementProfileService,
11911186
scoringService,
@@ -1210,7 +1205,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
12101205
// when
12111206
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
12121207
certificationAssessment: startedCertificationAssessment,
1213-
continueOnError,
12141208
areaRepository,
12151209
placementProfileService,
12161210
scoringService,
@@ -1226,7 +1220,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
12261220
// when
12271221
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
12281222
certificationAssessment,
1229-
continueOnError,
12301223
areaRepository,
12311224
placementProfileService,
12321225
scoringService,
@@ -1270,7 +1263,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
12701263
// when
12711264
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
12721265
certificationAssessment,
1273-
continueOnError,
12741266
areaRepository,
12751267
placementProfileService,
12761268
scoringService,
@@ -1307,7 +1299,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
13071299
// when
13081300
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
13091301
certificationAssessment,
1310-
continueOnError,
13111302
areaRepository,
13121303
placementProfileService,
13131304
scoringService,
@@ -1348,7 +1339,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
13481339
// when
13491340
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
13501341
certificationAssessment,
1351-
continueOnError,
13521342
areaRepository,
13531343
placementProfileService,
13541344
scoringService,
@@ -1366,7 +1356,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
13661356
// when
13671357
const { percentageCorrectAnswers } = await calculateCertificationAssessmentScore({
13681358
certificationAssessment: certificationAssessmentWithNeutralizedChallenge,
1369-
continueOnError,
13701359
areaRepository,
13711360
placementProfileService,
13721361
scoringService,
@@ -1432,7 +1421,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
14321421
// When
14331422
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
14341423
certificationAssessment,
1435-
continueOnError,
14361424
areaRepository,
14371425
placementProfileService,
14381426
scoringService,
@@ -1448,7 +1436,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
14481436
});
14491437

14501438
context('Calculate certification result when assessment is completed (stop on error)', function () {
1451-
const continueOnError = false;
14521439
let placementProfileService;
14531440
beforeEach(function () {
14541441
certificationAssessment = domainBuilder.buildCertificationAssessment({
@@ -1473,7 +1460,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
14731460
// when
14741461
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
14751462
certificationAssessment,
1476-
continueOnError,
14771463
areaRepository,
14781464
placementProfileService,
14791465
scoringService,
@@ -1517,7 +1503,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
15171503
// when
15181504
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
15191505
certificationAssessment,
1520-
continueOnError,
15211506
areaRepository,
15221507
placementProfileService,
15231508
scoringService,
@@ -1552,7 +1537,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
15521537
// when
15531538
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
15541539
certificationAssessment,
1555-
continueOnError,
15561540
areaRepository,
15571541
placementProfileService,
15581542
scoringService,
@@ -1593,7 +1577,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
15931577
// when
15941578
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
15951579
certificationAssessment,
1596-
continueOnError,
15971580
areaRepository,
15981581
placementProfileService,
15991582
scoringService,
@@ -1678,7 +1661,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
16781661
// when
16791662
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
16801663
certificationAssessment,
1681-
continueOnError,
16821664
areaRepository,
16831665
placementProfileService,
16841666
scoringService,
@@ -1778,7 +1760,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
17781760
// when
17791761
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
17801762
certificationAssessment,
1781-
continueOnError,
17821763
areaRepository,
17831764
placementProfileService,
17841765
scoringService,
@@ -1830,7 +1811,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
18301811
// when
18311812
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
18321813
certificationAssessment,
1833-
continueOnError,
18341814
areaRepository,
18351815
placementProfileService,
18361816
scoringService,
@@ -1876,7 +1856,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
18761856
// when
18771857
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
18781858
certificationAssessment: certificationAssessmentWithNeutralizedChallenge,
1879-
continueOnError: false,
18801859
areaRepository,
18811860
placementProfileService,
18821861
scoringService,
@@ -1901,7 +1880,6 @@ describe('Certification | Shared | Unit | Domain | Services | Scoring V2', funct
19011880
// when
19021881
const certificationAssessmentScore = await calculateCertificationAssessmentScore({
19031882
certificationAssessment: certificationAssessmentWithNeutralizedChallenge,
1904-
continueOnError: false,
19051883
areaRepository,
19061884
placementProfileService,
19071885
scoringService,

0 commit comments

Comments
 (0)