From ee2076a3f2af4f475b77ab382950a03d6256ab4a Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 26 May 2021 14:55:19 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../blueprints/data_rki/rki_service_import.py | 2 +-
.../blueprints/data_rki/rki_service_update.py | 22 +++++++++++++------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service_import.py b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
index 3bd4ec46..30b86da0 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_import.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
@@ -101,7 +101,7 @@ class RkiServiceImport:
if (k % 2000) == 0:
db.session.commit()
app.logger.info(" import RKI ... " + str(k) + " rows")
- if k == 120000:
+ if k == 200000:
break
db.session.commit()
app.logger.info(" import RKI ... " + str(k) + " rows total")
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service_update.py b/src/flask_covid19/blueprints/data_rki/rki_service_update.py
index bb406503..1e8900b8 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_update.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_update.py
@@ -171,6 +171,8 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase):
app.logger.info("------------------------------------------------------------")
RkiData.remove_all()
i = 0
+ d = 0
+ k = 0
last_rki_data = None
dict_locations = RkiLandkreis.find_all_as_dict()
dict_altersgruppen = RkiAltersgruppe.find_all_as_dict()
@@ -180,10 +182,10 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase):
# app.logger.info(" location: " + str(l_key) + " -> " + str(locations[l_key]))
# app.logger.info("------------------------------------------------------------")
for my_meldedatum in RkiMeldedatum.find_all():
- d = my_meldedatum.datum
+ my_meldedatum_datum = my_meldedatum.datum
# app.logger.info(" my_meldedatum: " + str(my_meldedatum) + " " + d.isoformat())
# app.logger.info("------------------------------------------------------------")
- list_imports = RkiImport.find_by_datum(my_datum=d)
+ list_imports = RkiImport.find_by_datum(my_datum=my_meldedatum_datum)
# if l_imports is None:
# app.logger.info("list_imports is None ")
# else:
@@ -222,14 +224,20 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase):
if last_rki_data == o:
last_rki_data.altersgruppen.append(my_altersgruppe)
else:
+ k += 1
o.altersgruppen.append(my_altersgruppe)
db.session.add(o)
last_rki_data = o
- i += 1
- if i % 2000 == 0:
- app.logger.info(" full update RKI data ... "+str(i)+" rows")
- db.session.commit()
- db.session.commit()
+ i += 1
+ d += 1
+ if d % 7 == 0:
+ db.session.commit()
+ s1 = str(i)
+ s2 = str(my_meldedatum)
+ s3 = str(k)
+ app.logger.info(" full update RKI data ... " + s1 + " rows ... " + s2 + " (" + s3 + ")")
+ k = 0
+ db.session.commit()
app.logger.info(" full update RKI data ... "+str(i)+" total rows")
app.logger.info("")
app.logger.info(" RkiServiceUpdateFull.__full_update_data [done]")
--
GitLab