Skip to content

Commit 8117b57

Browse files
szabozoltan69szabozoltan69
authored
Merge pull request #2280 from IFRCGo/fix/fdrs-latest-year-data
FDRS: Fetch only the latest year related data
2 parents 4f27124 + cc53652 commit 8117b57

File tree

5 files changed

+1081
-221
lines changed

5 files changed

+1081
-221
lines changed

‎databank/admin.py‎

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,40 @@ class CountryOverviewAdmin(admin.ModelAdmin):
7777
_("COUNTRY KEY INDICATORS (SOURCE: FDRS)"),
7878
{
7979
"fields": (
80-
"population",
81-
"urban_population",
82-
"gdp",
83-
"gnipc",
84-
"poverty",
85-
"life_expectancy",
86-
"literacy",
80+
"fdrs_population",
81+
"fdrs_population_data_year",
82+
"fdrs_urban_population",
83+
"fdrs_urban_population_data_year",
84+
"fdrs_gdp",
85+
"fdrs_gdp_data_year",
86+
"fdrs_gnipc",
87+
"fdrs_gnipc_data_year",
88+
"fdrs_poverty",
89+
"fdrs_poverty_data_year",
90+
"fdrs_life_expectancy",
91+
"fdrs_life_expectancy_data_year",
92+
"fdrs_literacy",
93+
"fdrs_literacy_data_year",
8794
)
8895
},
8996
),
9097
(
9198
_("NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"),
9299
{
93-
"fields": ("income", "expenditures", "volunteers", "trained_in_first_aid", "branches"),
100+
"fields": (
101+
"fdrs_income",
102+
"fdrs_income_data_year",
103+
"fdrs_expenditures",
104+
"fdrs_expenditures_data_year",
105+
"fdrs_volunteer_total",
106+
"fdrs_volunteer_data_year",
107+
"fdrs_staff_total",
108+
"fdrs_staff_data_year",
109+
"fdrs_trained_in_first_aid",
110+
"fdrs_trained_in_first_aid_data_year",
111+
"fdrs_branches",
112+
"fdrs_branches_data_year",
113+
),
94114
},
95115
),
96116
(_("KEY CLIMATE EVENT"), {"fields": ("avg_temperature", "avg_rainfall_precipitation", "rainy_season")}),
@@ -99,27 +119,27 @@ class CountryOverviewAdmin(admin.ModelAdmin):
99119
{
100120
"fields": (
101121
"world_bank_population",
102-
"calculated_world_bank_population_year",
122+
"world_bank_population_year",
103123
"world_bank_population_above_age_65",
104-
"calculated_world_bank_population_above_age_65_year",
124+
"world_bank_population_above_age_65_year",
105125
"world_bank_population_age_14",
106-
"calculated_world_bank_population_age_14_year",
126+
"world_bank_population_age_14_year",
107127
"world_bank_urban_population_percentage",
108-
"calculated_world_bank_urban_population_percentage_year",
128+
"world_bank_urban_population_percentage_year",
109129
"world_bank_gdp",
110-
"calculated_world_bank_gdp_year",
130+
"world_bank_gdp_year",
111131
"world_bank_gni",
112-
"calculated_world_bank_gni_year",
132+
"world_bank_gni_year",
113133
"world_bank_gender_equality_index",
114-
"calculated_world_bank_gender_equality_index_year",
134+
"world_bank_gender_equality_index_year",
115135
"world_bank_life_expectancy",
116-
"calculated_world_bank_life_expectancy_year",
136+
"world_bank_life_expectancy_year",
117137
"world_bank_literacy_rate",
118-
"calculated_world_bank_literacy_rate_year",
138+
"world_bank_literacy_rate_year",
119139
"world_bank_poverty_rate",
120-
"calculated_world_bank_poverty_rate_year",
140+
"world_bank_poverty_rate_year",
121141
"world_bank_gni_capita",
122-
"calculated_world_bank_gni_capita_year",
142+
"world_bank_gni_capita_year",
123143
)
124144
},
125145
),

‎databank/management/commands/ingest_worldbank.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,47 +25,47 @@ class CountryIndicatorData(typing.TypedDict):
2525
WORLD_BANK_INDICATOR_MAP = {
2626
"SP.POP.TOTL": (
2727
CountryOverview.world_bank_population,
28-
CountryOverview.calculated_world_bank_population_year,
28+
CountryOverview.world_bank_population_year,
2929
),
3030
"SP.POP.65UP.TO": (
3131
CountryOverview.world_bank_population_above_age_65,
32-
CountryOverview.calculated_world_bank_population_above_age_65_year,
32+
CountryOverview.world_bank_population_above_age_65_year,
3333
),
3434
"SP.POP.0014.TO": (
3535
CountryOverview.world_bank_population_age_14,
36-
CountryOverview.calculated_world_bank_population_age_14_year,
36+
CountryOverview.world_bank_population_age_14_year,
3737
),
3838
"SP.URB.TOTL.IN.ZS": (
3939
CountryOverview.world_bank_urban_population_percentage,
40-
CountryOverview.calculated_world_bank_urban_population_percentage_year,
40+
CountryOverview.world_bank_urban_population_percentage_year,
4141
),
4242
"NY.GDP.MKTP.CD": (
4343
CountryOverview.world_bank_gdp,
44-
CountryOverview.calculated_world_bank_gdp_year,
44+
CountryOverview.world_bank_gdp_year,
4545
),
4646
"NY.GNP.MKTP.CD": (
4747
CountryOverview.world_bank_gni,
48-
CountryOverview.calculated_world_bank_gni_year,
48+
CountryOverview.world_bank_gni_year,
4949
),
5050
"IQ.CPA.GNDR.XQ": (
5151
CountryOverview.world_bank_gender_equality_index,
52-
CountryOverview.calculated_world_bank_gender_equality_index_year,
52+
CountryOverview.world_bank_gender_equality_index_year,
5353
),
5454
"SP.DYN.LE00.IN": (
5555
CountryOverview.world_bank_life_expectancy,
56-
CountryOverview.calculated_world_bank_life_expectancy_year,
56+
CountryOverview.world_bank_life_expectancy_year,
5757
),
5858
"SE.ADT.LITR.ZS": (
5959
CountryOverview.world_bank_literacy_rate,
60-
CountryOverview.calculated_world_bank_literacy_rate_year,
60+
CountryOverview.world_bank_literacy_rate_year,
6161
),
6262
"SI.POV.NAHC": (
6363
CountryOverview.world_bank_poverty_rate,
64-
CountryOverview.calculated_world_bank_poverty_rate_year,
64+
CountryOverview.world_bank_poverty_rate_year,
6565
),
6666
"NY.GNP.PCAP.CD": (
6767
CountryOverview.world_bank_gni_capita,
68-
CountryOverview.calculated_world_bank_gni_capita_year,
68+
CountryOverview.world_bank_gni_capita_year,
6969
),
7070
}
7171

0 commit comments

Comments
 (0)