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

 Fix init profile partners issue date

See merge request !807

src/components/Action/ActionBegin.spec.tsx

-import React from 'react'
+import { Button } from '@material-ui/core'
 import { mount } from 'enzyme'
+import React from 'react'
+import { act } from 'react-dom/test-utils'
 import { Provider } from 'react-redux'
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
-import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import ActionModal from './ActionModal'
+import configureStore from 'redux-mock-store'
 import {
   AllEcogestureData,
   defaultEcogestureData,
 } from '../../../tests/__mocks__/actionData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
-import { Button } from '@material-ui/core'
-import ActionBegin from './ActionBegin'
-import { act } from 'react-dom/test-utils'
 import { ecogesturesData } from '../../../tests/__mocks__/ecogesturesData.mock'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
+import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
+import ActionBegin from './ActionBegin'
+import ActionModal from './ActionModal'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Action/ActionCard.spec.tsx

-import React from 'react'
+import { Button } from '@material-ui/core'
+import EcogestureModal from 'components/Ecogesture/EcogestureModal'
 import { mount } from 'enzyme'
+import React from 'react'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
 import ActionCard from './ActionCard'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
-import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
-import { Button } from '@material-ui/core'
-import EcogestureModal from 'components/Ecogesture/EcogestureModal'
 
 const mockStore = configureStore([])
 

src/components/Action/ActionChoose.spec.tsx

-import React from 'react'
 import { mount } from 'enzyme'
+import React from 'react'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
-import ActionChoose from './ActionChoose'
 import ActionBegin from './ActionBegin'
+import ActionChoose from './ActionChoose'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Action/ActionDone.spec.tsx

-import React from 'react'
+import { Button } from '@material-ui/core'
 import { mount } from 'enzyme'
-import configureStore from 'redux-mock-store'
+import React from 'react'
+import { act } from 'react-dom/test-utils'
+import * as reactRedux from 'react-redux'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import UsageEventService from 'services/usageEvent.service'
+import * as challengeActions from 'store/challenge/challenge.actions'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
 import ActionDone from './ActionDone'
-import { Button } from '@material-ui/core'
-import * as reactRedux from 'react-redux'
-import * as challengeActions from 'store/challenge/challenge.actions'
-import { act } from 'react-dom/test-utils'
-import UsageEventService from 'services/usageEvent.service'
 
 const mockStore = configureStore([])
 jest.mock('cozy-ui/transpiled/react/I18n', () => {

src/components/Action/ActionList.spec.tsx

-import React from 'react'
 import { mount } from 'enzyme'
-import configureStore from 'redux-mock-store'
+import React from 'react'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
-import ActionList from './ActionList'
-import ActionCard from './ActionCard'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
+import ActionCard from './ActionCard'
+import ActionList from './ActionList'
 
 const mockStore = configureStore([])
 

src/components/Action/ActionModal.spec.tsx

-import React from 'react'
+import { Button } from '@material-ui/core'
 import { mount } from 'enzyme'
+import React from 'react'
+import { act } from 'react-dom/test-utils'
+import * as reactRedux from 'react-redux'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import UsageEventService from 'services/usageEvent.service'
+import * as challengeActions from 'store/challenge/challenge.actions'
+import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
 import ActionModal from './ActionModal'
-import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
-import { Button } from '@material-ui/core'
-import * as reactRedux from 'react-redux'
-import * as challengeActions from 'store/challenge/challenge.actions'
-import { act } from 'react-dom/test-utils'
-import UsageEventService from 'services/usageEvent.service'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Action/ActionOnGoing.spec.tsx

-import React from 'react'
-import { mount } from 'enzyme'
-import { Provider } from 'react-redux'
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
-import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
 import { Button } from '@material-ui/core'
-import ActionOnGoing from './ActionOnGoing'
+import EcogestureModal from 'components/Ecogesture/EcogestureModal'
 import { UserActionState } from 'enum/userAction.enum'
+import { mount } from 'enzyme'
 import { DateTime } from 'luxon'
-import EcogestureModal from 'components/Ecogesture/EcogestureModal'
 import { UserAction } from 'models'
+import React from 'react'
 import { act } from 'react-dom/test-utils'
+import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import { defaultEcogestureData } from '../../../tests/__mocks__/actionData.mock'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
+import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
+import ActionOnGoing from './ActionOnGoing'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Action/ActionView.spec.tsx

-import React from 'react'
+import ActionView from 'components/Action/ActionView'
+import { UserActionState } from 'enum/userAction.enum'
 import { mount } from 'enzyme'
+import React from 'react'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { modalStateData } from '../../../tests/__mocks__/modalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import ActionView from 'components/Action/ActionView'
-import configureStore from 'redux-mock-store'
-import { UserActionState } from 'enum/userAction.enum'
 import ActionChoose from './ActionChoose'
-import ActionOnGoing from './ActionOnGoing'
 import ActionDone from './ActionDone'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import { modalStateData } from '../../../tests/__mocks__/modalStateData.mock'
+import ActionOnGoing from './ActionOnGoing'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Analysis/AnalysisConsumption.spec.tsx

 /* eslint-disable react/display-name */
-import React from 'react'
+import { Accordion } from '@material-ui/core'
+import Button from '@material-ui/core/Button'
+import AnalysisConsumption from 'components/Analysis/AnalysisConsumption'
+import { FluidType } from 'enum/fluid.enum'
 import { mount } from 'enzyme'
+import { DateTime } from 'luxon'
+import { PerformanceIndicator } from 'models'
+import React from 'react'
+import { act } from 'react-dom/test-utils'
 import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import AnalysisConsumption from 'components/Analysis/AnalysisConsumption'
-import { act } from 'react-dom/test-utils'
-import Button from '@material-ui/core/Button'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import {
   mockMonthlyForecastJanuaryTestProfile1,
   profileTypeData,
 } from '../../../tests/__mocks__/profileType.mock'
-import { FluidType } from 'enum/fluid.enum'
-import { PerformanceIndicator } from 'models'
-import { DateTime } from 'luxon'
-import { Accordion } from '@material-ui/core'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Analysis/AnalysisError.spec.tsx

-import React from 'react'
-import { mount } from 'enzyme'
+import Button from '@material-ui/core/Button'
+import Dialog from '@material-ui/core/Dialog'
 import AnalysisErrorModal from 'components/Analysis/AnalysisErrorModal'
+import { mount } from 'enzyme'
+import React from 'react'
+import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
-import { Provider } from 'react-redux'
-import Dialog from '@material-ui/core/Dialog'
-import Button from '@material-ui/core/Button'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Analysis/AnalysisView.spec.tsx

-import React from 'react'
+import AnalysisView from 'components/Analysis/AnalysisView'
 import { mount } from 'enzyme'
+import React from 'react'
 import * as reactRedux from 'react-redux'
 import { Provider } from 'react-redux'
-import AnalysisView from 'components/Analysis/AnalysisView'
+import * as globalActions from 'store/global/global.actions'
+import * as profileActions from 'store/profile/profile.actions'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import {
   createMockStore,
   mockInitialEcolyoState,
 } from '../../../tests/__mocks__/store'
-import * as globalActions from 'store/global/global.actions'
-import * as profileActions from 'store/profile/profile.actions'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Duel/DuelResultModal.spec.tsx

-import React from 'react'
 import { mount } from 'enzyme'
+import React from 'react'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
 
 import { act } from 'react-dom/test-utils'
 import DuelResultModal from './DuelResultModal'

src/components/Ecogesture/EcogestureEmptyList.spec.tsx

-import React from 'react'
+import Button from '@material-ui/core/Button'
 import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import React from 'react'
+import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
-import { Provider } from 'react-redux'
-import Button from '@material-ui/core/Button'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
 import EcogestureEmptyList from './EcogestureEmptyList'
-import toJson from 'enzyme-to-json'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Onboarding/WelcomeModal.spec.tsx

-import React from 'react'
+import { Button, IconButton } from '@material-ui/core'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
-import WelcomeModal from './WelcomeModal'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
+import React from 'react'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
 import * as profileActions from 'store/profile/profile.actions'
-import { Button, IconButton } from '@material-ui/core'
 import mockClient from '../../../tests/__mocks__/client'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
+import WelcomeModal from './WelcomeModal'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Options/ProfileTypeOptions/ProfileTypeOptions.spec.tsx

-import React from 'react'
-import { mount } from 'enzyme'
-import { Provider } from 'react-redux'
-import configureStore from 'redux-mock-store'
-import ProfileTypeOptions from 'components/Options/ProfileTypeOptions/ProfileTypeOptions'
-import { profileData } from '../../../../tests/__mocks__/profile.mock'
-import { mockProfileType } from '../../../../tests/__mocks__/profileType.mock'
+import profileIcon from 'assets/icons/ico/profile.svg'
 import StyledCard from 'components/CommonKit/Card/StyledCard'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import profileIcon from 'assets/icons/ico/profile.svg'
+import ProfileTypeOptions from 'components/Options/ProfileTypeOptions/ProfileTypeOptions'
 import {
   HousingType,
   IndividualInsulationWork,
   IndividualOrCollective,
   ThreeChoicesAnswer,
 } from 'enum/profileType.enum'
+import { mount } from 'enzyme'
+import React from 'react'
+import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import { profileData } from '../../../../tests/__mocks__/profileData.mock'
+import { mockProfileType } from '../../../../tests/__mocks__/profileType.mock'
 import { mockInitialChallengeState } from '../../../../tests/__mocks__/store'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {

src/components/Terms/DataShareConsentContent.spec.tsx

-import React from 'react'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
-import DataShareConsentContent from './DataShareConsentContent'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
+import React from 'react'
 import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
+import DataShareConsentContent from './DataShareConsentContent'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/components/Terms/TermsView.spec.tsx

-import React from 'react'
-import { mount } from 'enzyme'
-import TermsView from './TermsView'
-import { profileData } from '../../../tests/__mocks__/profile.mock'
-import configureStore from 'redux-mock-store'
-import { Provider } from 'react-redux'
 import { Button } from '@material-ui/core'
+import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
+import React from 'react'
 import * as reactRedux from 'react-redux'
-import { mockUpToDateTerm } from '../../../tests/__mocks__/termsData.mock'
+import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
 import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { profileData } from '../../../tests/__mocks__/profileData.mock'
+import { mockUpToDateTerm } from '../../../tests/__mocks__/termsData.mock'
+import TermsView from './TermsView'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {

src/db/profileData.json

-[
-  {
-    "ecogestureHash": "",
-    "challengeHash": "",
-    "mailToken": "",
-    "duelHash": "",
-    "quizHash": "",
-    "isFirstConnection": true,
-    "lastConnectionDate": "0000-01-01T00:00:00.000Z",
-    "haveSeenLastAnalysis": true,
-    "sendAnalysisNotification": true,
-    "monthlyAnalysisDate": "0000-01-01T00:00:00.000Z",
-    "sendConsumptionAlert": false,
-    "waterDailyConsumptionLimit": 0,
-    "isProfileTypeCompleted": false,
-    "isProfileEcogestureCompleted": false,
-    "onboarding": {
-      "isWelcomeSeen": false
-    },
-    "haveSeenEcogestureModal": false
-  }
-]

src/db/profileData.ts

+import { ProfileEntity } from 'models'
+
+const profileData: Omit<ProfileEntity, 'id'> = {
+  activateHalfHourDate: '0000-01-01T00:00:00.000Z',
+  challengeHash: '',
+  customPopupDate: '0000-01-01T00:00:00.000Z',
+  duelHash: '',
+  ecogestureHash: '',
+  explorationHash: '',
+  haveSeenEcogestureModal: false,
+  haveSeenLastAnalysis: true,
+  isFirstConnection: true,
+  isProfileEcogestureCompleted: false,
+  isProfileTypeCompleted: false,
+  lastConnectionDate: '0000-01-01T00:00:00.000Z',
+  mailToken: '',
+  monthlyAnalysisDate: '0000-01-01T00:00:00.000Z',
+  partnersIssueSeenDate: {
+    enedis: '0000-01-01T00:00:00.000Z',
+    egl: '0000-01-01T00:00:00.000Z',
+    grdf: '0000-01-01T00:00:00.000Z',
+  },
+  quizHash: '',
+  onboarding: {
+    isWelcomeSeen: false,
+  },
+  sendAnalysisNotification: true,
+  sendConsumptionAlert: false,
+  waterDailyConsumptionLimit: 0,
+}
+
+export default profileData

src/migrations/migration.spec.ts

@@ -3,12 +3,12 @@ import { FLUIDPRICES_DOCTYPE, PROFILE_DOCTYPE } from 'doctypes'
 import { FluidPrice, Profile } from 'models'
 import { Schema } from 'models/schema.models'
 import mockClient from '../../tests/__mocks__/client'
-import { profileData } from '../../tests/__mocks__/profile.mock'
+import { profileData } from '../../tests/__mocks__/profileData.mock'
 import { migrate, migrationLog } from './migration'
 import {
-  MIGRATION_RESULT_NOOP,
   MIGRATION_RESULT_COMPLETE,
   MIGRATION_RESULT_FAILED,
+  MIGRATION_RESULT_NOOP,
 } from './migration.data'
 import { Migration, MigrationResult } from './migration.type'