From af704ffeeae018fed30ff91c0b2875a5077f1e3f Mon Sep 17 00:00:00 2001 From: Paul Leclercq Date: Mon, 25 Nov 2024 14:01:23 +0100 Subject: [PATCH] refacto: remove directes from column names --- postgres/schemas/models.py | 10 +- .../mediatree/update_pg_keywords.py | 40 +++---- test/sitemap/test_detect_keywords.py | 40 +++---- test/sitemap/test_update_pg_keywords.py | 100 +++++++++--------- 4 files changed, 95 insertions(+), 95 deletions(-) diff --git a/postgres/schemas/models.py b/postgres/schemas/models.py index caa078aa..1f48613e 100644 --- a/postgres/schemas/models.py +++ b/postgres/schemas/models.py @@ -88,16 +88,16 @@ class Keywords(Base): number_of_keywords_biodiversite = Column(Integer) # sum of all biodiversite counters without duplicate number_of_keywords_ressources = Column(Integer) # sum of all ressources counters without duplicate number_of_changement_climatique_constat_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_changement_climatique_constat integer; - number_of_changement_climatique_causes_directes_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_changement_climatique_causes_directes integer; + number_of_changement_climatique_causes_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_changement_climatique_causes_directes integer; number_of_changement_climatique_consequences_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_changement_climatique_consequences integer; - number_of_attenuation_climatique_solutions_directes_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_attenuation_climatique_solutions_directes integer; - number_of_adaptation_climatique_solutions_directes_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_adaptation_climatique_solutions_directes integer; + number_of_attenuation_climatique_solutions_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_attenuation_climatique_solutions_directes integer; + number_of_adaptation_climatique_solutions_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_adaptation_climatique_solutions_directes integer; number_of_ressources_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_ressources_naturelles_concepts_generaux integer; number_of_ressources_solutions_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_ressources_solutions integer; number_of_biodiversite_concepts_generaux_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_biodiversite_concepts_generaux integer; - number_of_biodiversite_causes_directes_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_biodiversite_causes_directes integer; + number_of_biodiversite_causes_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_biodiversite_causes_directes integer; number_of_biodiversite_consequences_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_biodiversite_consequences integer; - number_of_biodiversite_solutions_directes_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_biodiversite_solutions_directes integer; + number_of_biodiversite_solutions_no_hrfp= Column(Integer) # ALTER TABLE keywords ADD number_of_biodiversite_solutions_directes integer; class Channel_Metadata(Base): __tablename__ = channel_metadata_table diff --git a/quotaclimat/data_processing/mediatree/update_pg_keywords.py b/quotaclimat/data_processing/mediatree/update_pg_keywords.py index 554ff6e8..ffbdbe70 100644 --- a/quotaclimat/data_processing/mediatree/update_pg_keywords.py +++ b/quotaclimat/data_processing/mediatree/update_pg_keywords.py @@ -52,16 +52,16 @@ def update_keywords(session: Session, batch_size: int = 50000, start_date : str ,new_number_of_keywords_biodiversite \ ,new_number_of_keywords_ressources \ ,number_of_changement_climatique_constat_no_hrfp \ - ,number_of_changement_climatique_causes_directes_no_hrfp \ + ,number_of_changement_climatique_causes_no_hrfp \ ,number_of_changement_climatique_consequences_no_hrfp \ - ,number_of_attenuation_climatique_solutions_directes_no_hrfp \ - ,number_of_adaptation_climatique_solutions_directes_no_hrfp \ + ,number_of_attenuation_climatique_solutions_no_hrfp \ + ,number_of_adaptation_climatique_solutions_no_hrfp \ ,number_of_ressources_no_hrfp \ ,number_of_ressources_solutions_no_hrfp \ ,number_of_biodiversite_concepts_generaux_no_hrfp \ - ,number_of_biodiversite_causes_directes_no_hrfp \ + ,number_of_biodiversite_causes_no_hrfp \ ,number_of_biodiversite_consequences_no_hrfp \ - ,number_of_biodiversite_solutions_directes_no_hrfp = get_themes_keywords_duration(plaintext, srt, start) + ,number_of_biodiversite_solutions_no_hrfp = get_themes_keywords_duration(plaintext, srt, start) except Exception as err: logging.error(f"continuing loop but met error : {err}") continue @@ -99,16 +99,16 @@ def update_keywords(session: Session, batch_size: int = 50000, start_date : str ,new_number_of_keywords_biodiversite ,new_number_of_keywords_ressources ,number_of_changement_climatique_constat_no_hrfp - ,number_of_changement_climatique_causes_directes_no_hrfp + ,number_of_changement_climatique_causes_no_hrfp ,number_of_changement_climatique_consequences_no_hrfp - ,number_of_attenuation_climatique_solutions_directes_no_hrfp - ,number_of_adaptation_climatique_solutions_directes_no_hrfp + ,number_of_attenuation_climatique_solutions_no_hrfp + ,number_of_adaptation_climatique_solutions_no_hrfp ,number_of_ressources_no_hrfp ,number_of_ressources_solutions_no_hrfp ,number_of_biodiversite_concepts_generaux_no_hrfp - ,number_of_biodiversite_causes_directes_no_hrfp + ,number_of_biodiversite_causes_no_hrfp ,number_of_biodiversite_consequences_no_hrfp - ,number_of_biodiversite_solutions_directes_no_hrfp + ,number_of_biodiversite_solutions_no_hrfp ) else: # Program only mode logging.info(f"Updating program for keyword {keyword_id} - {channel_name} - original tz : {start}") @@ -199,16 +199,16 @@ def update_keyword_row(session: Session, ,number_of_keywords_biodiversite: int ,number_of_keywords_ressources: int ,number_of_changement_climatique_constat_no_hrfp: int, - number_of_changement_climatique_causes_directes_no_hrfp: int, + number_of_changement_climatique_causes_no_hrfp: int, number_of_changement_climatique_consequences_no_hrfp: int, - number_of_attenuation_climatique_solutions_directes_no_hrfp: int, - number_of_adaptation_climatique_solutions_directes_no_hrfp: int, + number_of_attenuation_climatique_solutions_no_hrfp: int, + number_of_adaptation_climatique_solutions_no_hrfp: int, number_of_ressources_no_hrfp: int, number_of_ressources_solutions_no_hrfp: int, number_of_biodiversite_concepts_generaux_no_hrfp: int, - number_of_biodiversite_causes_directes_no_hrfp: int, + number_of_biodiversite_causes_no_hrfp: int, number_of_biodiversite_consequences_no_hrfp: int, - number_of_biodiversite_solutions_directes_no_hrfp: int + number_of_biodiversite_solutions_no_hrfp: int ): if matching_themes is not None: session.query(Keywords).filter(Keywords.id == keyword_id).update( @@ -232,16 +232,16 @@ def update_keyword_row(session: Session, ,Keywords.number_of_keywords_biodiversite: number_of_keywords_biodiversite ,Keywords.number_of_keywords_ressources: number_of_keywords_ressources ,Keywords.number_of_changement_climatique_constat_no_hrfp:number_of_changement_climatique_constat_no_hrfp , - Keywords.number_of_changement_climatique_causes_directes_no_hrfp:number_of_changement_climatique_causes_directes_no_hrfp , + Keywords.number_of_changement_climatique_causes_no_hrfp:number_of_changement_climatique_causes_no_hrfp , Keywords.number_of_changement_climatique_consequences_no_hrfp:number_of_changement_climatique_consequences_no_hrfp , - Keywords.number_of_attenuation_climatique_solutions_directes_no_hrfp:number_of_attenuation_climatique_solutions_directes_no_hrfp , - Keywords.number_of_adaptation_climatique_solutions_directes_no_hrfp:number_of_adaptation_climatique_solutions_directes_no_hrfp , + Keywords.number_of_attenuation_climatique_solutions_no_hrfp:number_of_attenuation_climatique_solutions_no_hrfp , + Keywords.number_of_adaptation_climatique_solutions_no_hrfp:number_of_adaptation_climatique_solutions_no_hrfp , Keywords.number_of_ressources_no_hrfp:number_of_ressources_no_hrfp, Keywords.number_of_ressources_solutions_no_hrfp:number_of_ressources_solutions_no_hrfp , Keywords.number_of_biodiversite_concepts_generaux_no_hrfp:number_of_biodiversite_concepts_generaux_no_hrfp , - Keywords.number_of_biodiversite_causes_directes_no_hrfp:number_of_biodiversite_causes_directes_no_hrfp , + Keywords.number_of_biodiversite_causes_no_hrfp:number_of_biodiversite_causes_no_hrfp , Keywords.number_of_biodiversite_consequences_no_hrfp:number_of_biodiversite_consequences_no_hrfp , - Keywords.number_of_biodiversite_solutions_directes_no_hrfp:number_of_biodiversite_solutions_directes_no_hrfp, + Keywords.number_of_biodiversite_solutions_no_hrfp:number_of_biodiversite_solutions_no_hrfp, }, synchronize_session=False ) diff --git a/test/sitemap/test_detect_keywords.py b/test/sitemap/test_detect_keywords.py index 3213e965..8e44e959 100644 --- a/test/sitemap/test_detect_keywords.py +++ b/test/sitemap/test_detect_keywords.py @@ -111,16 +111,16 @@ def test_one_theme_get_themes_keywords_duration(): number_of_keywords_biodiversite, number_of_keywords_ressources ,number_of_changement_climatique_constat_no_hrfp, - number_of_changement_climatique_causes_directes_no_hrfp, + number_of_changement_climatique_causes_no_hrfp, number_of_changement_climatique_consequences_no_hrfp, - number_of_attenuation_climatique_solutions_directes_no_hrfp, - number_of_adaptation_climatique_solutions_directes_no_hrfp, + number_of_attenuation_climatique_solutions_no_hrfp, + number_of_adaptation_climatique_solutions_no_hrfp, number_of_ressources_no_hrfp, number_of_ressources_solutions_no_hrfp, number_of_biodiversite_concepts_generaux_no_hrfp, - number_of_biodiversite_causes_directes_no_hrfp, + number_of_biodiversite_causes_no_hrfp, number_of_biodiversite_consequences_no_hrfp, - number_of_biodiversite_solutions_directes_no_hrfp) = get_themes_keywords_duration(plaintext_climat, subtitles, start) + number_of_biodiversite_solutions_no_hrfp) = get_themes_keywords_duration(plaintext_climat, subtitles, start) assert set(themes_output) == set(themes) # assert compare_unordered_lists_of_dicts(keywords_output, keywords) @@ -235,16 +235,16 @@ def test_long_sentence_theme_get_themes_keywords_duration(): number_of_keywords_biodiversite, number_of_keywords_ressources ,number_of_changement_climatique_constat_no_hrfp, - number_of_changement_climatique_causes_directes_no_hrfp, + number_of_changement_climatique_causes_no_hrfp, number_of_changement_climatique_consequences_no_hrfp, - number_of_attenuation_climatique_solutions_directes_no_hrfp, - number_of_adaptation_climatique_solutions_directes_no_hrfp, + number_of_attenuation_climatique_solutions_no_hrfp, + number_of_adaptation_climatique_solutions_no_hrfp, number_of_ressources_no_hrfp, number_of_ressources_solutions_no_hrfp, number_of_biodiversite_concepts_generaux_no_hrfp, - number_of_biodiversite_causes_directes_no_hrfp, + number_of_biodiversite_causes_no_hrfp, number_of_biodiversite_consequences_no_hrfp, - number_of_biodiversite_solutions_directes_no_hrfp) = get_themes_keywords_duration(plaintext_climat, subtitles, start) + number_of_biodiversite_solutions_no_hrfp) = get_themes_keywords_duration(plaintext_climat, subtitles, start) assert set(themes_output) == set(themes) # assert compare_unordered_lists_of_dicts(keywords_output, keywords) @@ -307,16 +307,16 @@ def test_three_get_themes_keywords_duration(): number_of_keywords_biodiversite, number_of_keywords_ressources ,number_of_changement_climatique_constat_no_hrfp, - number_of_changement_climatique_causes_directes_no_hrfp, + number_of_changement_climatique_causes_no_hrfp, number_of_changement_climatique_consequences_no_hrfp, - number_of_attenuation_climatique_solutions_directes_no_hrfp, - number_of_adaptation_climatique_solutions_directes_no_hrfp, + number_of_attenuation_climatique_solutions_no_hrfp, + number_of_adaptation_climatique_solutions_no_hrfp, number_of_ressources_no_hrfp, number_of_ressources_solutions_no_hrfp, number_of_biodiversite_concepts_generaux_no_hrfp, - number_of_biodiversite_causes_directes_no_hrfp, + number_of_biodiversite_causes_no_hrfp, number_of_biodiversite_consequences_no_hrfp, - number_of_biodiversite_solutions_directes_no_hrfp) = get_themes_keywords_duration("record de température pizza adaptation au dérèglement climatique", subtitles, start) + number_of_biodiversite_solutions_no_hrfp) = get_themes_keywords_duration("record de température pizza adaptation au dérèglement climatique", subtitles, start) assert set(themes_output)== themes #assert keywords_output == keywords @@ -377,16 +377,16 @@ def test_long_get_themes_keywords_duration(): number_of_keywords_biodiversite, number_of_keywords_ressources ,number_of_changement_climatique_constat_no_hrfp, - number_of_changement_climatique_causes_directes_no_hrfp, + number_of_changement_climatique_causes_no_hrfp, number_of_changement_climatique_consequences_no_hrfp, - number_of_attenuation_climatique_solutions_directes_no_hrfp, - number_of_adaptation_climatique_solutions_directes_no_hrfp, + number_of_attenuation_climatique_solutions_no_hrfp, + number_of_adaptation_climatique_solutions_no_hrfp, number_of_ressources_no_hrfp, number_of_ressources_solutions_no_hrfp, number_of_biodiversite_concepts_generaux_no_hrfp, - number_of_biodiversite_causes_directes_no_hrfp, + number_of_biodiversite_causes_no_hrfp, number_of_biodiversite_consequences_no_hrfp, - number_of_biodiversite_solutions_directes_no_hrfp) = get_themes_keywords_duration("il rencontre aussi une crise majeure de la pénurie de l' offre laetitia jaoude des barrages sauvages", subtitles, start) + number_of_biodiversite_solutions_no_hrfp) = get_themes_keywords_duration("il rencontre aussi une crise majeure de la pénurie de l' offre laetitia jaoude des barrages sauvages", subtitles, start) assert set(themes_output) == set(themes) # too hard to maintain #assert compare_unordered_lists_of_dicts(keywords_output, keywords) diff --git a/test/sitemap/test_update_pg_keywords.py b/test/sitemap/test_update_pg_keywords.py index a7b05843..83830aaf 100644 --- a/test/sitemap/test_update_pg_keywords.py +++ b/test/sitemap/test_update_pg_keywords.py @@ -200,16 +200,16 @@ def test_first_update_keywords(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }]) assert save_to_pg(df, keywords_table, conn) == 1 @@ -236,16 +236,16 @@ def test_first_update_keywords(): ,number_of_keywords_biodiversite \ ,number_of_keywords_ressources \ ,number_of_changement_climatique_constat_no_hrfp \ - ,number_of_changement_climatique_causes_directes_no_hrfp \ + ,number_of_changement_climatique_causes_no_hrfp \ ,number_of_changement_climatique_consequences_no_hrfp \ - ,number_of_attenuation_climatique_solutions_directes_no_hrfp \ - ,number_of_adaptation_climatique_solutions_directes_no_hrfp \ + ,number_of_attenuation_climatique_solutions_no_hrfp \ + ,number_of_adaptation_climatique_solutions_no_hrfp \ ,number_of_ressources_no_hrfp \ ,number_of_ressources_solutions_no_hrfp \ ,number_of_biodiversite_concepts_generaux_no_hrfp \ - ,number_of_biodiversite_causes_directes_no_hrfp \ + ,number_of_biodiversite_causes_no_hrfp \ ,number_of_biodiversite_consequences_no_hrfp \ - ,number_of_biodiversite_solutions_directes_no_hrfp = get_themes_keywords_duration(plaintext, srt, start) + ,number_of_biodiversite_solutions_no_hrfp = get_themes_keywords_duration(plaintext, srt, start) assert result_after_update.id == result_before_update.id @@ -332,16 +332,16 @@ def test_update_only_one_channel(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }, { "id" : primary_key_tf1, "start": start, @@ -370,16 +370,16 @@ def test_update_only_one_channel(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }]) assert save_to_pg(df, keywords_table, conn) == 2 @@ -410,16 +410,16 @@ def test_update_only_one_channel(): ,number_of_keywords_biodiversite \ ,number_of_keywords_ressources \ ,number_of_changement_climatique_constat_no_hrfp \ - ,number_of_changement_climatique_causes_directes_no_hrfp \ + ,number_of_changement_climatique_causes_no_hrfp \ ,number_of_changement_climatique_consequences_no_hrfp \ - ,number_of_attenuation_climatique_solutions_directes_no_hrfp \ - ,number_of_adaptation_climatique_solutions_directes_no_hrfp \ + ,number_of_attenuation_climatique_solutions_no_hrfp \ + ,number_of_adaptation_climatique_solutions_no_hrfp \ ,number_of_ressources_no_hrfp \ ,number_of_ressources_solutions_no_hrfp \ ,number_of_biodiversite_concepts_generaux_no_hrfp \ - ,number_of_biodiversite_causes_directes_no_hrfp \ + ,number_of_biodiversite_causes_no_hrfp \ ,number_of_biodiversite_consequences_no_hrfp \ - ,number_of_biodiversite_solutions_directes_no_hrfp = get_themes_keywords_duration(plaintext, srt, start) + ,number_of_biodiversite_solutions_no_hrfp = get_themes_keywords_duration(plaintext, srt, start) assert result_after_update_tf1.id == result_before_update_tf1.id assert result_after_update_m6.id == result_before_update_m6.id @@ -498,16 +498,16 @@ def test_update_only_program(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }]) assert save_to_pg(df, keywords_table, conn) == 1 @@ -583,16 +583,16 @@ def test_update_only_program_with_only_one_channel(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }, { "id" : primary_key_tf1, "start": start, @@ -621,16 +621,16 @@ def test_update_only_program_with_only_one_channel(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }]) assert save_to_pg(df, keywords_table, conn) == 2 @@ -721,16 +721,16 @@ def test_update_only_empty_program(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }, { "id" : primary_key_tf1, "start": start, @@ -759,16 +759,16 @@ def test_update_only_empty_program(): ,"number_of_keywords_biodiversite": wrong_value ,"number_of_keywords_ressources": wrong_value ,"number_of_changement_climatique_constat_no_hrfp": wrong_value, - "number_of_changement_climatique_causes_directes_no_hrfp": wrong_value, + "number_of_changement_climatique_causes_no_hrfp": wrong_value, "number_of_changement_climatique_consequences_no_hrfp": wrong_value, - "number_of_attenuation_climatique_solutions_directes_no_hrfp": wrong_value, - "number_of_adaptation_climatique_solutions_directes_no_hrfp": wrong_value, + "number_of_attenuation_climatique_solutions_no_hrfp": wrong_value, + "number_of_adaptation_climatique_solutions_no_hrfp": wrong_value, "number_of_ressources_no_hrfp": wrong_value, "number_of_ressources_solutions_no_hrfp": wrong_value, "number_of_biodiversite_concepts_generaux_no_hrfp": wrong_value, - "number_of_biodiversite_causes_directes_no_hrfp": wrong_value, + "number_of_biodiversite_causes_no_hrfp": wrong_value, "number_of_biodiversite_consequences_no_hrfp": wrong_value, - "number_of_biodiversite_solutions_directes_no_hrfp" : wrong_value + "number_of_biodiversite_solutions_no_hrfp" : wrong_value }]) assert save_to_pg(df, keywords_table, conn) == 2