diff --git a/.vscode/settings.json b/.vscode/settings.json index cc6c8aa7ed3d0b55c08845d5ea156f03aaa8d619..7f58d87e15f258f564f44481ab3c81266743b713 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -89,6 +89,7 @@ "energical", "Epgl", "esnext", + "Explo", "firstname", "fluidchart", "fluidchartslide", diff --git a/src/services/challenge.service.spec.ts b/src/services/challenge.service.spec.ts index 146d9121abe367e994c7e466661b2d5221eddd7b..d7da26cd4891d6bf4ff6a6971d61e08a62596384 100644 --- a/src/services/challenge.service.spec.ts +++ b/src/services/challenge.service.spec.ts @@ -60,7 +60,7 @@ jest.mock('./exploration.service', () => { getExplorationEntityById: mockGetExplorationEntityById, parseExplorationEntityToUserExploration: mockParseExplorationEntityToUserExploration, - getUserExplorationfromExplorationEntities: + getUserExplorationFromExplorationEntities: mockGetUserExplorationFromExplorationEntities, })) }) diff --git a/src/services/challenge.service.ts b/src/services/challenge.service.ts index db2fa38168310d569d11c3ba2c1b46b5d3d37ee1..1021f80b74141d705614f594603e2d645c37e245 100644 --- a/src/services/challenge.service.ts +++ b/src/services/challenge.service.ts @@ -245,7 +245,7 @@ export default class ChallengeService { const explorationService = new ExplorationService(this._client) for (const explorationRelation of explorationEntityRelation) { const exploration: UserExploration = - explorationService.getUserExplorationfromExplorationEntities( + explorationService.getUserExplorationFromExplorationEntities( explorationEntities || [], explorationRelation._id ) @@ -350,18 +350,18 @@ export default class ChallengeService { if (challengeEntityList.length > 0 && userChallengeList.length === 0) { for (const challenge of challengeEntityList) { const relationEntities = await this.getRelationEntities(challenge) - const duel: UserDuel = duelService.getDuelfromDuelEntities( + const duel: UserDuel = duelService.getDuelFromDuelEntities( duelEntities || [], relationEntities.duelEntityRelation._id ) - const quiz: UserQuiz = quizService.getUserQuizfromQuizEntities( + const quiz: UserQuiz = quizService.getUserQuizFromQuizEntities( quizEntities || [], relationEntities.quizEntityRelation._id ) // Only one exploration relation if (relationEntities.explorationEntityRelation.length === 1) { const exploration: UserExploration = - explorationService.getUserExplorationfromExplorationEntities( + explorationService.getUserExplorationFromExplorationEntities( explorationEntities || [], relationEntities.explorationEntityRelation[0]._id ) @@ -405,11 +405,11 @@ export default class ChallengeService { buildList.push(userChallenge) } else { const relationEntities = await this.getRelationEntities(challenge) - const duel: UserDuel = duelService.getDuelfromDuelEntities( + const duel: UserDuel = duelService.getDuelFromDuelEntities( duelEntities || [], relationEntities.duelEntityRelation._id ) - const quiz: UserQuiz = quizService.getUserQuizfromQuizEntities( + const quiz: UserQuiz = quizService.getUserQuizFromQuizEntities( quizEntities || [], relationEntities.quizEntityRelation._id ) diff --git a/src/services/consumptionFormatter.service.ts b/src/services/consumptionFormatter.service.ts index cc05206889191b517bd1936f52ad0cffb046420e..ba32ef5fa25bdf5259629bf0aca299a4b4a40f8e 100644 --- a/src/services/consumptionFormatter.service.ts +++ b/src/services/consumptionFormatter.service.ts @@ -25,12 +25,12 @@ export default class ConsumptionFormatterService { } const dateChartService = new DateChartService() while (parsingDate <= endDate) { - const filtereddata = data.filter(dt => + const filteredData = data.filter(dt => dateChartService.compareStepDate(timeStep, dt.date, parsingDate) ) const newElement: Dataload = this.defineDataloadState( - filtereddata[0] - ? filtereddata[0] + filteredData[0] + ? filteredData[0] : { date: parsingDate, value: -1, diff --git a/src/services/duel.service.spec.ts b/src/services/duel.service.spec.ts index 93cd9552abc03d91449dc2814d1bbb00aade13ac..16936841cdfde122ece5f3342f72b4941ef0b809 100644 --- a/src/services/duel.service.spec.ts +++ b/src/services/duel.service.spec.ts @@ -197,11 +197,11 @@ describe('Duel service', () => { }) }) - describe('getDuelfromDuelEntities method', () => { + describe('getDuelFromDuelEntities method', () => { it('should return the userDuel from a duelEntity', () => { const searchId = 'DUEL001' - const result = duelService.getDuelfromDuelEntities(allDuelData, searchId) + const result = duelService.getDuelFromDuelEntities(allDuelData, searchId) expect(result).toEqual(duelData) }) }) diff --git a/src/services/duel.service.ts b/src/services/duel.service.ts index 9b39dec44b10f5fbdc7b2403faee9c7269695fe3..333383853d02a6e1b241a5ec3c4c6b2d0b698d0c 100644 --- a/src/services/duel.service.ts +++ b/src/services/duel.service.ts @@ -287,7 +287,7 @@ export default class DuelService { * @param {DuelEntity[]} duelEntityList - userDuel to update * @param {string} searchId - userDuel to update */ - public getDuelfromDuelEntities( + public getDuelFromDuelEntities( duelEntityList: DuelEntity[], searchId: string ): UserDuel { diff --git a/src/services/exploration.service.spec.ts b/src/services/exploration.service.spec.ts index cb9ed9de840f7052200cf950decdbb4614b4a420..6307effc4aef9d291c42d50757d3cea92b049322 100644 --- a/src/services/exploration.service.spec.ts +++ b/src/services/exploration.service.spec.ts @@ -94,11 +94,11 @@ describe('Exploration service', () => { }) }) - describe('getUserExplorationfromExplorationEntities method', () => { + describe('getUserExplorationFromExplorationEntities method', () => { it('should return the userExploration from a explorationEntity', () => { const searchId = 'EXPLORATION001' const result = - explorationService.getUserExplorationfromExplorationEntities( + explorationService.getUserExplorationFromExplorationEntities( allExplorationEntities, searchId ) diff --git a/src/services/exploration.service.ts b/src/services/exploration.service.ts index 605b9f54cb09d1db617559d8650d09b55321274d..18d2fb35604837903df98d53b650b05e72a4a1cf 100644 --- a/src/services/exploration.service.ts +++ b/src/services/exploration.service.ts @@ -63,7 +63,7 @@ export default class ExplorationService { * @param {ExplorationEntity[]} explorationEntityList - userExploration to update * @param {string} searchId - userExploration to update */ - public getUserExplorationfromExplorationEntities( + public getUserExplorationFromExplorationEntities( explorationEntityList: ExplorationEntity[], searchId: string ): UserExploration { diff --git a/src/services/quiz.service.spec.ts b/src/services/quiz.service.spec.ts index 72e49bae4769eb4f1a373ba368ba95faee325d6e..9ede8bf0ac866c2a9fdc72d336f8be1ba4fda057 100644 --- a/src/services/quiz.service.spec.ts +++ b/src/services/quiz.service.spec.ts @@ -138,11 +138,11 @@ describe('Quiz service', () => { }) }) - describe('getUserQuizfromQuizEntities method', () => { + describe('getUserQuizFromQuizEntities method', () => { it('should return the userQuiz from a quizEntity', () => { const searchId = 'QUIZ001' - const result = quizService.getUserQuizfromQuizEntities( + const result = quizService.getUserQuizFromQuizEntities( allQuizEntities, searchId ) diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts index c3341bc63fd78de7976f1fc54e347bebe00248e4..cccf2d93cabab72c5aa6c6f388262d4d0c7af356 100644 --- a/src/services/quiz.service.ts +++ b/src/services/quiz.service.ts @@ -37,9 +37,9 @@ export default class QuizService { */ public async getAllQuizEntities(): Promise<QuizEntity[]> { const query: QueryDefinition = Q(QUIZ_DOCTYPE) - const { data: quizs }: QueryResult<QuizEntity[]> = + const { data: quizzes }: QueryResult<QuizEntity[]> = await this._client.query(query) - return quizs + return quizzes } /** @@ -74,7 +74,7 @@ export default class QuizService { * @param {QuizEntity[]} quizEntityList - userQuiz to update * @param {string} searchId - userQuiz to update */ - public getUserQuizfromQuizEntities( + public getUserQuizFromQuizEntities( quizEntityList: QuizEntity[], searchId: string ): UserQuiz { diff --git a/tests/__mocks__/userChallengeData.mock.ts b/tests/__mocks__/userChallengeData.mock.ts index 3966c3f0b4a98577899f9bcd8f46a4f85dc7f5af..497daa2f0b48e9d65cb4b720cfc0ef430f174883 100644 --- a/tests/__mocks__/userChallengeData.mock.ts +++ b/tests/__mocks__/userChallengeData.mock.ts @@ -359,7 +359,7 @@ export const userChallengeExplo4: UserChallenge = { fluid_condition: [0], progress: 0, message_success: - 'Vous avez dévérrouillé les données électricité à la demi-heure', + 'Vous avez déverrouillé les données électricité à la demi-heure', }, action: { ecogesture: null,