diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7770d02e479197ae8c8ed4d0e62ccc15d7fe1e7b..3ad3142a888350649255c8c1f35c0fa5d2709e6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,35 +2,37 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-### [1.7.3](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.2...v1.7.3) (2022-02-02)
+### [1.7.4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.3...v1.7.4) (2022-02-07)
+
+### Bug Fixes
+- **migration:** Prevent deprecated migration to launch ([169d843](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/169d843e0ce9dca38d6c263385023910c86e6886))
-### Features
+### [1.7.3](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.2...v1.7.3) (2022-02-02)
-* **fluidPrice:** Add new elec fluid price (1 feb 2022) ([0a82a61](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/0a82a61d2a9793b019dc123ad393d5b03e60725d))
-* **fluidPrices:** Replaced migration system with hash system ([669ecaa](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/669ecaa8767ed1ba3ac1a5d9877400665eca247b))
+### Features
+- **fluidPrice:** Add new elec fluid price (1 feb 2022) ([0a82a61](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/0a82a61d2a9793b019dc123ad393d5b03e60725d))
+- **fluidPrices:** Replaced migration system with hash system ([669ecaa](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/669ecaa8767ed1ba3ac1a5d9877400665eca247b))
### Bug Fixes
-* **manifest:** Change text for backoffice remote doctype description ([21f6c2d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/21f6c2d8655c63677cb3d37085a76aaad3babf02))
-* **modal:** Sort prices by fluid so it displays in the right order ([dc1db27](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/dc1db276c209b188b25b0c0ff85542a1047d8ef3))
-* **connection:** Fix account duplication in connection flow ([917218f4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/917218f48f1fb8b1362279208751d75160e84e62))
+- **manifest:** Change text for backoffice remote doctype description ([21f6c2d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/21f6c2d8655c63677cb3d37085a76aaad3babf02))
+- **modal:** Sort prices by fluid so it displays in the right order ([dc1db27](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/dc1db276c209b188b25b0c0ff85542a1047d8ef3))
+- **connection:** Fix account duplication in connection flow ([917218f4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/917218f48f1fb8b1362279208751d75160e84e62))
### [1.7.2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.1...v1.7.2) (2022-01-28)
-
### Features
-* **enedisAnalysis:** New calculation for minimum consumption ([292a95d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/292a95dee13fde8b8b220f81e77ca5c74bae7fc4))
-* **newsletter:** Added new image and styles ([4dabbc5](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/4dabbc58e4cf6bccd37164a7d96ecb0c3b3b92c6))
-
+- **enedisAnalysis:** New calculation for minimum consumption ([292a95d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/292a95dee13fde8b8b220f81e77ca5c74bae7fc4))
+- **newsletter:** Added new image and styles ([4dabbc5](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/4dabbc58e4cf6bccd37164a7d96ecb0c3b3b92c6))
### Bug Fixes
-* **ecogesture:** Fix focus buttons on IOS ([ed3dfb0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/ed3dfb0c0aa4a78985acebaa3e6568a41f6136f0))
-* **Migration:** Resolve "Bloqué sur écran chargement Ecolyo" ([630a690](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/630a690dcd3d54a3590f9ac9cf4f749c14f0adde))
-* **profileType:** Remove data from previous profileType when the question is not asked again ([00e53fd](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/00e53fdef9d79f1ba30ebcc4c656fb56a90055a5))
+- **ecogesture:** Fix focus buttons on IOS ([ed3dfb0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/ed3dfb0c0aa4a78985acebaa3e6568a41f6136f0))
+- **Migration:** Resolve "Bloqué sur écran chargement Ecolyo" ([630a690](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/630a690dcd3d54a3590f9ac9cf4f749c14f0adde))
+- **profileType:** Remove data from previous profileType when the question is not asked again ([00e53fd](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/00e53fdef9d79f1ba30ebcc4c656fb56a90055a5))
### [1.7.1](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.0...v1.7.1) (2022-01-26)
diff --git a/manifest.webapp b/manifest.webapp
index 320346246b9a3f745bf3c72ea1dd3079c14cd6e4..f0e802d3dbaee9a8c9f769315007fa2829111189 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -3,7 +3,7 @@
"slug": "ecolyo",
"icon": "icon.svg",
"categories": ["energy"],
- "version": "1.7.3",
+ "version": "1.7.4",
"licence": "AGPL-3.0",
"editor": "Métropole de Lyon",
"default_locale": "fr",
diff --git a/package.json b/package.json
index 6e0fbfc6cb71b7b16f9a00182047d236a419c998..8cfcfa24a248c7572687ca711f2e1368c6ba436b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ecolyo",
- "version": "1.7.3",
+ "version": "1.7.4",
"scripts": {
"tx": "tx pull --all || true",
"lint": "yarn lint:js && yarn lint:styles",
diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts
index a99bd4e99eb31bb9d9ebb7b60e9c745cc1038df1..1f4220283c7731f4701ac36e232de5d38816e1b8 100644
--- a/src/migrations/migration.data.ts
+++ b/src/migrations/migration.data.ts
@@ -15,18 +15,10 @@ import {
GRDF_YEAR_DOCTYPE,
ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
} from 'doctypes'
-import {
- DataloadEntity,
- FluidPrice,
- Profile,
- ProfileType,
- UserChallenge,
-} from 'models'
+import { DataloadEntity, Profile, ProfileType, UserChallenge } from 'models'
import { Client } from 'cozy-client'
import { DateTime } from 'luxon'
import { UserQuizState } from 'enum/userQuiz.enum'
-import fluidsPricesData from 'db/fluidPrices.json'
-import { FluidType } from 'enum/fluid.enum'
export const SCHEMA_INITIAL_VERSION = 0
@@ -288,8 +280,9 @@ export const migrations: Migration[] = [
releaseNotes: null,
docTypes: FLUIDPRICES_DOCTYPE,
isCreate: true,
+ isDeprecated: true,
run: async (_client: Client, docs: any[]): Promise<any> => {
- return null
+ return []
},
},
{
@@ -497,9 +490,9 @@ export const migrations: Migration[] = [
description: 'Init new fluidPrices for water -- deprecated --',
releaseNotes: null,
docTypes: FLUIDPRICES_DOCTYPE,
-
+ isDeprecated: true,
run: async (_client: Client, docs: any[]): Promise<any> => {
- return null
+ return []
},
},
{
diff --git a/src/migrations/migration.ts b/src/migrations/migration.ts
index 6dfe010f6526d38de1c8bfce281de623acb3f1d4..fa923665f993f3c094fdea6a95395a7e1fe1f7bd 100644
--- a/src/migrations/migration.ts
+++ b/src/migrations/migration.ts
@@ -143,7 +143,9 @@ export async function migrate(
migration.docTypes,
migration.queryOptions
)
- if (docToUpdate.length && !migration.isCreate) {
+ if (migration.isDeprecated) {
+ result = migrationNoop()
+ } else if (docToUpdate.length && !migration.isCreate) {
const migratedDocs = await migration.run(_client, docToUpdate)
if (migratedDocs.length) {
result = await save(_client, migratedDocs)
@@ -155,7 +157,7 @@ export async function migrate(
}
// Handle new doctype creation
- if (migration.isCreate) {
+ if (migration.isCreate && !migration.isDeprecated) {
await migration.run(_client, docToUpdate)
result = { type: MIGRATION_RESULT_COMPLETE, errors: [] }
}
diff --git a/src/migrations/migration.type.ts b/src/migrations/migration.type.ts
index 84ebe24e5da9640799cecf99296f13018944727d..505363b2f1ec2dc3a33e373f3473742fcd48478e 100644
--- a/src/migrations/migration.type.ts
+++ b/src/migrations/migration.type.ts
@@ -28,6 +28,7 @@ export type Migration = {
releaseNotes: Notes | null
docTypes: string
isCreate?: boolean
+ isDeprecated?: boolean
queryOptions?: MigrationQueryOptions
appVersion: string
run: (_client: Client, docs: any[]) => Promise<any[]>