refactoring

This commit is contained in:
frankknoll
2023-09-30 17:05:59 +02:00
parent 26ebf43d5d
commit 77f88b4f15

View File

@@ -4,30 +4,32 @@ class CountryCountsByClickedBatchcodeProvider:
@staticmethod
def getCountryCountsByClickedBatchcode(file):
exploration = pd.read_csv(file, index_col = 0, skiprows = [0, 1, 2, 3, 4, 5, 7])
exploration.index.name = 'VAX_LOT'
exploration.rename(
columns =
{
return CountryCountsByClickedBatchcodeProvider._read_csv(
file = file,
columns = {
'Country': 'COUNTRY',
'Event count': 'COUNTRY_COUNT_BY_VAX_LOT'
},
inplace = True)
exploration.set_index('COUNTRY', append = True, inplace = True)
return exploration
index_columns = ['COUNTRY'])
@staticmethod
def getCityCountsByClickedBatchcode(file):
exploration = pd.read_csv(file, index_col = 0, skiprows = [0, 1, 2, 3, 4, 5, 7])
exploration.index.name = 'VAX_LOT'
exploration.rename(
columns =
{
return CountryCountsByClickedBatchcodeProvider._read_csv(
file = file,
columns = {
'Country': 'COUNTRY',
'Region': 'REGION',
'City': 'CITY',
'Event count': 'CITY_COUNT_BY_VAX_LOT'
},
index_columns = ['COUNTRY', 'REGION', 'CITY'])
@staticmethod
def _read_csv(file, columns, index_columns):
exploration = pd.read_csv(file, index_col = 0, skiprows = [0, 1, 2, 3, 4, 5, 7])
exploration.index.name = 'VAX_LOT'
exploration.rename(
columns = columns,
inplace = True)
exploration.set_index(['COUNTRY', 'REGION', 'CITY'], append = True, inplace = True)
exploration.set_index(index_columns, append = True, inplace = True)
return exploration