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

Merge branch 'fix-init-profile-partners-issue-date' into '2.2.0'

:star: Fix init profile partners issue date

See merge request !807
parents 8d27dad4 43b0a844
Branches
Tags
4 merge requests!8192.2.0 to master,!8102.2.0 Milestone MR,!807⭐️ Fix init profile partners issue date,!741chore: remove unused lib eslint-config-cozy-app
import { QueryResult } from 'cozy-client'
import { DateTime } from 'luxon'
import { UserChallenge } from 'models'
import InitializationService from './initialization.service'
import mockClient from '../../tests/__mocks__/client'
import InitializationService from './initialization.service'
import ecogestureData from 'db/ecogestureData.json'
import challengeEntityData from 'db/challengeEntity.json'
import duelEntityData from 'db/duelEntity.json'
import quizEntityData from 'db/quizEntity.json'
import ecogestureData from 'db/ecogestureData.json'
import explorationEntityData from 'db/explorationEntity.json'
import quizEntityData from 'db/quizEntity.json'
import { hashFile } from 'utils/hash'
import { getActualAnalysisDate } from 'utils/date'
import { FluidType } from 'enum/fluid.enum'
import { ecogesturesData } from '../../tests/__mocks__/ecogesturesData.mock'
import { profileData } from '../../tests/__mocks__/profile.mock'
import { fluidStatusData } from '../../tests/__mocks__/fluidStatusData.mock'
import { userChallengeData } from '../../tests/__mocks__/userChallengeData.mock'
import { graphData } from '../../tests/__mocks__/datachartData.mock'
import { getActualAnalysisDate } from 'utils/date'
import { hashFile } from 'utils/hash'
import { allChallengeEntityData } from '../../tests/__mocks__/challengeEntity.mock'
import { graphData } from '../../tests/__mocks__/datachartData.mock'
import { allDuelEntity } from '../../tests/__mocks__/duelData.mock'
import { allQuizEntities } from '../../tests/__mocks__/quizData.mock'
import { ecogesturesData } from '../../tests/__mocks__/ecogesturesData.mock'
import { allExplorationEntities } from '../../tests/__mocks__/explorationData.mock'
import { fluidPrices } from '../../tests/__mocks__/fluidPrice.mock'
import { fluidStatusData } from '../../tests/__mocks__/fluidStatusData.mock'
import { profileData } from '../../tests/__mocks__/profileData.mock'
import { allQuizEntities } from '../../tests/__mocks__/quizData.mock'
import {
mockOutdatedTerm,
mockUpToDateTerm,
} from '../../tests/__mocks__/termsData.mock'
import { fluidPrices } from '../../tests/__mocks__/fluidPrice.mock'
import { userChallengeData } from '../../tests/__mocks__/userChallengeData.mock'
const mockCreateIndexKonnector = jest.fn()
jest.mock('./konnector.service', () => {
......
......@@ -5,7 +5,7 @@ import challengeEntityData from 'db/challengeEntity.json'
import duelEntityData from 'db/duelEntity.json'
import ecogestureData from 'db/ecogestureData.json'
import explorationEntityData from 'db/explorationEntity.json'
import profileData from 'db/profileData.json'
import profileData from 'db/profileData'
import quizEntityData from 'db/quizEntity.json'
import {
CHALLENGE_DOCTYPE,
......@@ -86,7 +86,7 @@ export default class InitializationService {
// Population with the data
const { data: newProfile } = await this._client.create(
PROFILE_DOCTYPE,
profileData[0]
profileData
)
if (newProfile) {
logApp.info('[Initialization] Profile created')
......
......@@ -2,7 +2,7 @@ import { QueryResult } from 'cozy-client'
import { DateTime } from 'luxon'
import { Profile } from 'models'
import mockClient from '../../tests/__mocks__/client'
import { profileData } from '../../tests/__mocks__/profile.mock'
import { profileData } from '../../tests/__mocks__/profileData.mock'
import ProfileService from './profile.service'
describe('UserProfile service', () => {
......
......@@ -22,15 +22,6 @@ export default class ProfileService {
* @returns {Profile}
*/
private parseProfileEntityToProfile(profileEntity: ProfileEntity): Profile {
const yesterday: DateTime = DateTime.local()
.minus({ day: 1 })
.startOf('day')
const partnersIssueSeenDate = {
enedis: yesterday,
egl: yesterday,
grdf: yesterday,
}
const profile: Profile = {
...profileEntity,
monthlyAnalysisDate:
......@@ -38,7 +29,11 @@ export default class ProfileService {
? this.getDate(profileEntity.monthlyAnalysisDate)
: profileEntity.monthlyAnalysisDate,
lastConnectionDate: this.getDate(profileEntity.lastConnectionDate),
partnersIssueSeenDate: partnersIssueSeenDate,
partnersIssueSeenDate: {
enedis: this.getDate(profileEntity.partnersIssueSeenDate.enedis),
egl: this.getDate(profileEntity.partnersIssueSeenDate.egl),
grdf: this.getDate(profileEntity.partnersIssueSeenDate.grdf),
},
activateHalfHourDate: this.getDate(profileEntity.activateHalfHourDate),
customPopupDate: this.getDate(profileEntity.customPopupDate),
}
......
import { UPDATE_PROFILE, updateProfile } from './profile.actions'
import { profileData } from '../../../tests/__mocks__/profile.mock'
import { profileData } from '../../../tests/__mocks__/profileData.mock'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
import { updateProfile, UPDATE_PROFILE } from './profile.actions'
const mockUpdateProfile = jest.fn()
jest.mock('services/profile.service', () => {
......
import { profileReducer } from './profile.reducer'
import { UPDATE_PROFILE } from './profile.actions'
import { profileData } from '../../../tests/__mocks__/profileData.mock'
import { mockInitialProfileState } from '../../../tests/__mocks__/store'
import { profileData } from '../../../tests/__mocks__/profile.mock'
import { UPDATE_PROFILE } from './profile.actions'
import { profileReducer } from './profile.reducer'
describe('profile reducer', () => {
it('should return the initial state', () => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment