added new orgs in monitor

dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step16-createIndicatorsTables.sql

@@ -335,8 +335,8 @@ select ar.organization, rf.no_result_fair/ar.no_allresults org_fairness
 from allresults ar
          join result_fair rf on rf.organization=ar.organization; /*EOS*/
 
-DROP VIEW result_fair; /*EOS*/
-DROP VIEW allresults; /*EOS*/
+DROP VIEW result_fair;
+DROP VIEW allresults;
 
 CREATE TEMPORARY VIEW result_fair as
     select year, ro.organization organization, count(distinct ro.id) no_result_fair from ${stats_db_name}.result_organization ro
@@ -1000,16 +1000,13 @@ left outer join (
 drop table if exists ${stats_db_name}.result_country purge; /*EOS*/
 
 create table ${stats_db_name}.result_country stored as parquet as
-select distinct * from (
-    select ro.id, o.country as country
-    from ${stats_db_name}.result_organization ro
-    join ${stats_db_name}.organization o on o.id=ro.organization
-    union all
-    select rp.id, f.country as country
-    from ${stats_db_name}.result_projects rp
-    left outer join ${stats_db_name}.project p on p.id=rp.project
-    left outer join ${stats_db_name}.funder f on f.name=p.funder ) u
-where u.country is not NULL; /*EOS*/
+select distinct ro.id, coalesce(o.country, f.country)
+from ${stats_db_name}.result_organization ro
+left outer join ${stats_db_name}.organization o on o.id=ro.organization
+left outer join ${stats_db_name}.result_projects rp on rp.id=ro.id
+left outer join ${stats_db_name}.project p on p.id=rp.project
+left outer join ${stats_db_name}.funder f on f.name=p.funder
+where coalesce(o.country, f.country) IS NOT NULL;
 
 drop table if exists ${stats_db_name}.indi_result_oa_with_license purge; /*EOS*/
 create table ${stats_db_name}.indi_result_oa_with_license stored as parquet as