Skip to content
Snippets Groups Projects
Commit 93ee5c02 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge remote-tracking branch 'origin/dev' into 391-log-loading-times

parents 0e111ba7 6909179b
No related branches found
No related tags found
1 merge request!884feat: log loading times
......@@ -15,17 +15,17 @@ import { Migration, MigrationResult } from './migration.type'
export class MigrationService {
private readonly _client: Client
private readonly _setinitStepError: React.Dispatch<
private readonly _setInitStepError: React.Dispatch<
React.SetStateAction<InitStepsErrors | null>
>
constructor(
_client: Client,
_setinitStepError: React.Dispatch<
_setInitStepError: React.Dispatch<
React.SetStateAction<InitStepsErrors | null>
>
) {
this._client = _client
this._setinitStepError = _setinitStepError
this._setInitStepError = _setInitStepError
}
/**
* Return schema version
......@@ -74,7 +74,7 @@ export class MigrationService {
const result = await migrate(migration, this._client)
if (result.type === MIGRATION_RESULT_FAILED) {
// Error in case of second failure
this._setinitStepError(InitStepsErrors.MIGRATION_ERROR)
this._setInitStepError(InitStepsErrors.MIGRATION_ERROR)
logApp.error(migrationLog(migration, result))
Sentry.captureException(migrationLog(migration, result))
throw new Error()
......
......@@ -55,21 +55,21 @@ const logStack = logger.namespace('initializationService')
export default class InitializationService {
private readonly _client: Client
private readonly _setinitStep: React.Dispatch<React.SetStateAction<InitSteps>>
private readonly _setinitStepError: React.Dispatch<
private readonly _setInitStep: React.Dispatch<React.SetStateAction<InitSteps>>
private readonly _setInitStepError: React.Dispatch<
React.SetStateAction<InitStepsErrors | null>
>
constructor(
_client: Client,
_setinitStep: React.Dispatch<React.SetStateAction<InitSteps>>,
_setinitStepError: React.Dispatch<
_setInitStep: React.Dispatch<React.SetStateAction<InitSteps>>,
_setInitStepError: React.Dispatch<
React.SetStateAction<InitStepsErrors | null>
>
) {
this._client = _client
this._setinitStep = _setinitStep
this._setinitStepError = _setinitStepError
this._setInitStep = _setInitStep
this._setInitStepError = _setInitStepError
}
/**
......@@ -82,7 +82,7 @@ export default class InitializationService {
const startTime = performance.now()
const profileService = new ProfileService(this._client)
try {
this._setinitStep(InitSteps.PROFILE)
this._setInitStep(InitSteps.PROFILE)
const loadedProfile = await profileService.getProfile()
if (!loadedProfile) {
// Population with the data
......@@ -93,7 +93,7 @@ export default class InitializationService {
if (newProfile) {
logDuration('[Initialization] Profile created', startTime)
} else {
this._setinitStepError(InitStepsErrors.PROFILE_ERROR)
this._setInitStepError(InitStepsErrors.PROFILE_ERROR)
throw new Error('initProfile: Profile not created')
}
}
......@@ -105,7 +105,7 @@ export default class InitializationService {
logDuration('[Initialization] Profile loaded and updated in', startTime)
return updatedProfile
} catch (error) {
this._setinitStepError(InitStepsErrors.PROFILE_ERROR)
this._setInitStepError(InitStepsErrors.PROFILE_ERROR)
const errorMessage = `Initialization error - initProfile: :${JSON.stringify(
error
......@@ -131,7 +131,7 @@ export default class InitializationService {
logDuration('[Initialization] ProfileType loaded', startTime)
return loadedProfileType
} catch (error) {
this._setinitStepError(InitStepsErrors.PROFILETYPE_ERROR)
this._setInitStepError(InitStepsErrors.PROFILETYPE_ERROR)
const errorMessage = `Initialization error - initProfileType: ${JSON.stringify(
error
)}`
......@@ -150,7 +150,7 @@ export default class InitializationService {
logDuration('[Initialization] ProfileEcogesture loaded', startTime)
return loadedProfileEcogesture
} catch (error) {
this._setinitStepError(InitStepsErrors.PROFILETYPE_ERROR)
this._setInitStepError(InitStepsErrors.PROFILETYPE_ERROR)
const errorMessage = `Initialization error - initProfileEcogesture: ${JSON.stringify(
error
)}`
......@@ -163,7 +163,7 @@ export default class InitializationService {
public async initEcogesture(hash: string): Promise<string> {
const startTime = performance.now()
this._setinitStep(InitSteps.ECOGESTURE)
this._setInitStep(InitSteps.ECOGESTURE)
const hashEcogestureType = hashFile(ecogestureData)
const ecogestureService = new EcogestureService(this._client)
// Populate data if none ecogesture exists
......@@ -180,7 +180,7 @@ export default class InitializationService {
// Check of created document based on count
const checkCount = await ecogestureService.getAllEcogestures()
if (!checkCount || checkCount?.length !== ecogestureData.length) {
this._setinitStepError(InitStepsErrors.ECOGESTURE_ERROR)
this._setInitStepError(InitStepsErrors.ECOGESTURE_ERROR)
throw new Error(
'initEcogesture: Created ecogesture type entities does not match'
)
......@@ -188,7 +188,7 @@ export default class InitializationService {
logDuration('[Initialization] Ecogesture list created', startTime)
return hashEcogestureType
} catch (error) {
this._setinitStepError(InitStepsErrors.ECOGESTURE_ERROR)
this._setInitStepError(InitStepsErrors.ECOGESTURE_ERROR)
const errorMessage = `Initialization error - initEcogesture: ${JSON.stringify(
error
)}`
......@@ -221,7 +221,7 @@ export default class InitializationService {
// Check of created document based on count
const checkCount = await ecogestureService.getAllEcogestures()
if (!checkCount || checkCount?.length !== ecogestureData.length) {
this._setinitStepError(InitStepsErrors.ECOGESTURE_ERROR)
this._setInitStepError(InitStepsErrors.ECOGESTURE_ERROR)
throw new Error(
'initEcogesture: Created ecogesture type entities does not match'
)
......@@ -229,7 +229,7 @@ export default class InitializationService {
logDuration('[Initialization] Ecogesture updated', startTime)
return hashEcogestureType
} catch (error) {
this._setinitStepError(InitStepsErrors.ECOGESTURE_ERROR)
this._setInitStepError(InitStepsErrors.ECOGESTURE_ERROR)
const errorMessage = `Initialization error - initEcogesture: ${JSON.stringify(
error
)}`
......@@ -291,7 +291,7 @@ export default class InitializationService {
public async initChallengeEntity(hash: string): Promise<string> {
const startTime = performance.now()
this._setinitStep(InitSteps.CHALLENGES)
this._setInitStep(InitSteps.CHALLENGES)
const challengeHash = hashFile(challengeEntityData)
const challengeService = new ChallengeService(this._client)
// Populate data if none challengeEntity exists
......@@ -306,7 +306,7 @@ export default class InitializationService {
// Check of created document
const checkCount = await challengeService.getAllChallengeEntities()
if (!checkCount || checkCount?.length !== challengeEntityData.length) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initChallengeEntity: Created challenge entities does not match'
)
......@@ -314,7 +314,7 @@ export default class InitializationService {
logDuration('[Initialization] Challenge entities created', startTime)
return challengeHash
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initChallengeEntity: ${JSON.stringify(
error
)}`
......@@ -337,7 +337,7 @@ export default class InitializationService {
// Check of created document
const checkCount = await challengeService.getAllChallengeEntities()
if (!checkCount || checkCount?.length !== challengeEntityData.length) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initChallengeEntity: Created challenge entities does not match'
)
......@@ -345,7 +345,7 @@ export default class InitializationService {
logDuration('[Initialization] Challenge entities updated', startTime)
return challengeHash
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initChallengeEntity: ${JSON.stringify(
error
)}`
......@@ -376,7 +376,7 @@ export default class InitializationService {
// Check of created document
const checkCount = await duelService.getAllDuelEntities()
if (!checkCount || checkCount?.length !== duelEntityData.length) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initDuelEntity: Created duel entities does not match'
)
......@@ -384,7 +384,7 @@ export default class InitializationService {
logDuration('[Initialization] UserDuel entities created', startTime)
return hashDuelEntity
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initDuelEntity: ${JSON.stringify(
error
)}`
......@@ -407,7 +407,7 @@ export default class InitializationService {
// Check of created document
const checkCount = await duelService.getAllDuelEntities()
if (!checkCount || checkCount?.length !== duelEntityData.length) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initDuelEntity: Created duel entities does not match'
)
......@@ -415,7 +415,7 @@ export default class InitializationService {
logDuration('[Initialization] UserDuel entities updated', startTime)
return hashDuelEntity
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initDuelEntity: ${JSON.stringify(
error
)}`
......@@ -446,7 +446,7 @@ export default class InitializationService {
// Check of created document
const checkCount = await quizService.getAllQuizEntities()
if (!checkCount || checkCount?.length !== quizEntityData.length) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initQuizEntity: Created quiz entities does not match'
)
......@@ -455,7 +455,7 @@ export default class InitializationService {
logDuration('[Initialization] Quiz entities created', startTime)
return quizHash
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initQuizEntity: ${JSON.stringify(
error
)}`
......@@ -478,7 +478,7 @@ export default class InitializationService {
// Check of created document
const checkCount = await quizService.getAllQuizEntities()
if (!checkCount || checkCount?.length !== quizEntityData.length) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initQuizEntity: Created quiz entities does not match'
)
......@@ -486,7 +486,7 @@ export default class InitializationService {
logDuration('[Initialization] Quiz entities updated', startTime)
return quizHash
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initQuizEntity: ${JSON.stringify(
error
)}`
......@@ -521,7 +521,7 @@ export default class InitializationService {
!checkCount ||
checkCount?.length !== explorationEntityData.length
) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initExplorationEntity: Created exploration entities does not match'
)
......@@ -529,7 +529,7 @@ export default class InitializationService {
logDuration('[Initialization] Exploration entities created', startTime)
return explorationHash
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initExplorationEntity: ${JSON.stringify(
error
)}`
......@@ -555,7 +555,7 @@ export default class InitializationService {
!checkCount ||
checkCount?.length !== explorationEntityData.length
) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error(
'initExplorationEntity: Created exploration entities does not match'
)
......@@ -563,7 +563,7 @@ export default class InitializationService {
logDuration('[Initialization] Exploration entities updated', startTime)
return explorationHash
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initExplorationEntity: ${JSON.stringify(
error
)}`
......@@ -609,7 +609,7 @@ export default class InitializationService {
}
}
} catch (error) {
this._setinitStepError(InitStepsErrors.ANALYSIS_ERROR)
this._setInitStepError(InitStepsErrors.ANALYSIS_ERROR)
const errorMessage = `Initialization error - initAnalysis: ${JSON.stringify(
error
)}`
......@@ -634,11 +634,11 @@ export default class InitializationService {
logDuration('[Initialization] Fluid Types loaded', startTime)
return fluidtypes
} else {
this._setinitStepError(InitStepsErrors.CONSOS_ERROR)
this._setInitStepError(InitStepsErrors.CONSOS_ERROR)
throw new Error('initFluidTypes: FluidTypes not found')
}
} catch (error) {
this._setinitStepError(InitStepsErrors.CONSOS_ERROR)
this._setInitStepError(InitStepsErrors.CONSOS_ERROR)
logApp.error('Initialization error - : ', error)
const errorMessage = `Initialization error - initFluidTypes: ${JSON.stringify(
error
......@@ -659,17 +659,17 @@ export default class InitializationService {
const startTime = performance.now()
const fs = new FluidService(this._client)
try {
this._setinitStep(InitSteps.CONSOS)
this._setInitStep(InitSteps.CONSOS)
const fluidStatus = await fs.getFluidStatus()
if (fluidStatus) {
logDuration('[Initialization] Fluid Status loaded', startTime)
return fluidStatus
} else {
this._setinitStepError(InitStepsErrors.CONSOS_ERROR)
this._setInitStepError(InitStepsErrors.CONSOS_ERROR)
throw new Error('initFluidStatus: fluidStatus not found')
}
} catch (error) {
this._setinitStepError(InitStepsErrors.CONSOS_ERROR)
this._setInitStepError(InitStepsErrors.CONSOS_ERROR)
const errorMessage = `Initialization error - initFluidStatus: ${JSON.stringify(
error
)}`
......@@ -698,11 +698,11 @@ export default class InitializationService {
logDuration('[Initialization] initUserChallenges', startTime)
return userChallengeList
} else {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
throw new Error('initUserChallenges: userChallengeList not found')
}
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - initUserChallenges: ${JSON.stringify(
error
)}`
......@@ -730,7 +730,7 @@ export default class InitializationService {
logDuration('[Initialization] initDuelProgress finished', startTime)
return { updatedUserChallenge, dataloads }
} catch (error) {
this._setinitStepError(InitStepsErrors.CHALLENGES_ERROR)
this._setInitStepError(InitStepsErrors.CHALLENGES_ERROR)
const errorMessage = `Initialization error - : ${JSON.stringify(error)}`
logStack('error', errorMessage)
logApp.error(errorMessage)
......@@ -746,7 +746,7 @@ export default class InitializationService {
}
const startTime = performance.now()
try {
this._setinitStep(InitSteps.CONSENT)
this._setInitStep(InitSteps.CONSENT)
const termService = new TermsService(this._client)
const isUpToDate = await termService.isConsentVersionUpToDate()
const lastTerm = await termService.getLastTerm()
......@@ -785,7 +785,7 @@ export default class InitializationService {
return termsStatus
} catch (error) {
this._setinitStepError(InitStepsErrors.CONSENT_ERROR)
this._setInitStepError(InitStepsErrors.CONSENT_ERROR)
const errorMessage = `Initialization error - initConsent: ${JSON.stringify(
error
)}`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment