Skip to content

feat: Add preprocessing for enum_type_doublage_id on mur #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: preprocessMurs
Choose a base branch
from
Open

feat: Add preprocessing for enum_type_doublage_id on mur #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/dpe/domain/murs/pre-process-murs.service.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class PreProcessMursService {
if (!murDE.epaisseur_structure) {
/**
* Certains logiciels omettent le champ 'epaisseur_structure'
* Récupération de cette information si elle existe dans la description via regex "(\d+) cm"
* Récupération de cette information si elle existe dans la description via regex "(\d+) cm".
* @type {number}
*/
let epaisseurStructure = getThicknessFromDescription(murDE.description);
Expand All @@ -44,6 +44,26 @@ export class PreProcessMursService {
murDE.epaisseur_structure = epaisseurStructure;
}
}

/**
* Certaines descriptions contiennent des informations sur le type de doublage.
* Il arrive régulièrement que les id dans les données d'entrées ne soient pas à jour
* Récupération de cette information si elle existe dans la description.
* @type {number}
*/
let typeDoublage = parseInt(murDE.enum_type_doublage_id);

if (typeDoublage === 1 || typeDoublage === 2) {
if (murDE.description.toLowerCase().indexOf('doublage connu (plâtre, brique') !== -1) {
murDE.enum_type_doublage_id = '5';
} else if (
murDE.description.toLowerCase().indexOf('doublage indéterminé avec lame') !== -1
) {
murDE.enum_type_doublage_id = '4';
} else if (murDE.description.toLowerCase().indexOf('doublage indéterminé ou lame') !== -1) {
murDE.enum_type_doublage_id = '3';
}
}
});
}
}
26 changes: 26 additions & 0 deletions src/dpe/domain/murs/pre-process-murs.service.spec.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ describe('PreProcessMursService service tests', () => {
enum_orientation_id: '4',
tv_umur0_id: '46',
enum_type_vitrage_id: '2',
enum_type_doublage_id: '1',
enum_type_baie_id: '4',
enum_type_materiaux_menuiserie_id: '5'
}
Expand Down Expand Up @@ -60,4 +61,29 @@ describe('PreProcessMursService service tests', () => {
service.preprocess(dpe);
expect(dpe.logement.enveloppe.mur_collection.mur[0].donnee_entree.epaisseur_structure).toBe(25);
});

it.each([
['1', '1', ''],
['1', '5', 'doublage connu (plâtre, brique'],
['1', '4', 'doublage indéterminé avec lame'],
['1', '3', 'doublage indéterminé ou lame'],
['2', '2', ''],
['2', '5', 'doublage connu (plâtre, brique'],
['2', '4', 'doublage indéterminé avec lame'],
['2', '3', 'doublage indéterminé ou lame'],
['3', '3', 'doublage connu (plâtre, brique'],
['4', '4', 'doublage indéterminé ou lame'],
['5', '5', 'doublage indéterminé ou lame']
])(
'enum_type_doublage_id %s mis à jour en %s à partir de la description %s',
(enum_type_doublage_id, expectedTypeDoublage, description) => {
dpe.logement.enveloppe.mur_collection.mur[0].donnee_entree.enum_type_doublage_id =
enum_type_doublage_id;
dpe.logement.enveloppe.mur_collection.mur[0].donnee_entree.description = description;
service.preprocess(dpe);
expect(dpe.logement.enveloppe.mur_collection.mur[0].donnee_entree.enum_type_doublage_id).toBe(
expectedTypeDoublage
);
}
);
});