From 1910fa588498db6037dc51d1e8278c707ac894a3 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Thu, 22 Aug 2024 12:31:06 +0000
Subject: [PATCH] chore: fix typos
---
.vscode/settings.json | 1 +
src/services/challenge.service.spec.ts | 2 +-
src/services/challenge.service.ts | 12 ++++++------
src/services/consumptionFormatter.service.ts | 6 +++---
src/services/duel.service.spec.ts | 4 ++--
src/services/duel.service.ts | 2 +-
src/services/exploration.service.spec.ts | 4 ++--
src/services/exploration.service.ts | 2 +-
src/services/quiz.service.spec.ts | 4 ++--
src/services/quiz.service.ts | 6 +++---
tests/__mocks__/userChallengeData.mock.ts | 2 +-
11 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index cc6c8aa7e..7f58d87e1 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 146d9121a..d7da26cd4 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 db2fa3816..1021f80b7 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 cc0520688..ba32ef5fa 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 93cd9552a..16936841c 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 9b39dec44..333383853 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 cb9ed9de8..6307effc4 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 605b9f54c..18d2fb356 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 72e49bae4..9ede8bf0a 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 c3341bc63..cccf2d93c 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 3966c3f0b..497daa2f0 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,
--
GitLab