working on: 0.0.33 Release

src/covid19/blueprints/ecdc/ecdc_service_update.py

@@ -18,7 +18,7 @@ class EcdcServiceUpdateBase:
 class EcdcServiceUpdateFull(EcdcServiceUpdateBase):
 
     def __full_update_date_reported(self):
-        app.logger.info(" __update_date_reported [begin]")
+        app.logger.info(" __full_update_date_reported [begin]")
         app.logger.info("------------------------------------------------------------")
         EcdcData.remove_all()
         EcdcDateReported.remove_all()
@@ -27,23 +27,19 @@ class EcdcServiceUpdateFull(EcdcServiceUpdateBase):
         for result_item in result_date_rep:
             k += 1
             my_date_rep = result_item[0]
-            oo = EcdcDateReported.find_by_date_reported(my_date_rep)
-            if oo is None:
-                o = EcdcDateReported.create_new_object_factory(
-                    my_date_rep=my_date_rep
-                )
-                db.session.add(o)
-                db.session.commit()
-            app.logger.info("| " + my_date_rep + " | " + str(k) + " rows ")
-        app.logger.info(" __update_date_reported [done]")
+            o = EcdcDateReported.create_new_object_factory(
+                my_date_rep=my_date_rep
+            )
+            db.session.add(o)
+            app.logger.info("| full update date_reported " + str(o) + " | " + str(k) + " rows ")
+        db.session.commit()
+        app.logger.info(" __full_update_date_reported [done]")
         app.logger.info("------------------------------------------------------------")
         return self
 
     def __full_update_continent(self):
-        app.logger.info(" __update_continent [begin]")
+        app.logger.info(" __full_update_continent [begin]")
         app.logger.info("------------------------------------------------------------")
-        EcdcData.remove_all()
-        EcdcCountry.remove_all()
         EcdcContinent.remove_all()
         result_continent = EcdcImport.get_continent()
         for result_item in result_continent:
@@ -51,18 +47,19 @@ class EcdcServiceUpdateFull(EcdcServiceUpdateBase):
             o = EcdcContinent(
                 region=my_continent_exp
             )
-            app.logger.info("| " + str(o) + " |")
+            app.logger.info(" full update continent | " + str(o) + " |")
             db.session.add(o)
         db.session.commit()
-        app.logger.info(" __update_continent [done]")
+        app.logger.info(" __full_update_continent [done]")
         app.logger.info("------------------------------------------------------------")
         return self
 
     def __full_update_country(self):
-        app.logger.info(" __update_country [begin]")
+        app.logger.info(" __full_update_country [begin]")
         app.logger.info("------------------------------------------------------------")
         EcdcData.remove_all()
         EcdcCountry.remove_all()
+        self.__full_update_continent()
         all_continents = EcdcContinent.get_all()
         for my_continent in all_continents:
             result_countries_of_continent = EcdcImport.get_countries_of_continent(my_continent)
@@ -73,10 +70,10 @@ class EcdcServiceUpdateFull(EcdcServiceUpdateBase):
                     geo_id=c[2],
                     country_territory_code=c[3],
                     continent=my_continent)
-                app.logger.info("| " + str(o) + " |")
+                app.logger.info(" full update country | " + str(o) + " |")
                 db.session.add(o)
-            db.session.commit()
-        app.logger.info(" __update_country [done]")
+        db.session.commit()
+        app.logger.info(" __full_update_country [done]")
         app.logger.info("------------------------------------------------------------")
         return self
 
@@ -149,30 +146,35 @@ class EcdcServiceUpdateFull(EcdcServiceUpdateBase):
         app.logger.info("------------------------------------------------------------")
         EcdcData.remove_all()
         i = 0
+        k = 0
+        d = 0
         dict_date_reported_from_import = self.__get_date_reported_from_import()
         for my_date_reported in dict_date_reported_from_import.keys():
-            my_ecdc_datereported = dict_date_reported_from_import[my_date_reported]
-            for item_ecdc_data_import in EcdcImport.find_by_date_reported(my_date_reported):
-                my_ecdc_country = self.__get_country_from_import(item_ecdc_data_import)
-                my_deaths = int(item_ecdc_data_import.deaths)
-                my_cases = int(item_ecdc_data_import.cases)
-                if item_ecdc_data_import.cumulative_number_for_14_days_of_covid19_cases_per_100000 == '':
+            ecdc_datereported = dict_date_reported_from_import[my_date_reported]
+            d += 1
+            for ecdc_import in EcdcImport.find_by_date_reported(my_date_reported):
+                ecdc_country = self.__get_country_from_import(ecdc_import)
+                my_deaths = int(ecdc_import.deaths)
+                my_cases = int(ecdc_import.cases)
+                if ecdc_import.cumulative_number_for_14_days_of_covid19_cases_per_100000 == '':
                     my_cumulative_number = 0.0
                 else:
                     my_cumulative_number = \
-                        float(item_ecdc_data_import.cumulative_number_for_14_days_of_covid19_cases_per_100000)
+                        float(ecdc_import.cumulative_number_for_14_days_of_covid19_cases_per_100000)
                 o = EcdcData(
-                    ecdc_country=my_ecdc_country,
-                    ecdc_datereported=my_ecdc_datereported,
+                    ecdc_country=ecdc_country,
+                    ecdc_datereported=ecdc_datereported,
                     deaths=my_deaths,
                     cases=my_cases,
                     cumulative_number_for_14_days_of_covid19_cases_per_100000=my_cumulative_number
                 )
                 db.session.add(o)
                 i += 1
-                if i % 1000 == 0:
-                    app.logger.info(" update EDCD initial ... " + str(i) + " rows")
-                    db.session.commit()
+                k += 1
+            if d % 7 == 0:
+                app.logger.info(" full update EDCD ... " + str(i) + " rows for " + str(ecdc_datereported) + "("+str(k)+")")
+                k = 0
+                db.session.commit()
         db.session.commit()
         app.logger.info(" update ECDC initial ... " + str(i) + " rows total")
         app.logger.info(" __update_data_initial [done]")