francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2023-10-03 19:59:50 +02:00
parent ac6435de7d
commit 6c50e43bbc
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/CountryCountsByClickedBatchcodeProvider.py
View File

@@ -1,22 +1,15 @@
import pandas as pd import pandas as pd
from GoogleAnalytics.ResolutionProvider import Resolution, ResolutionProvider
class CountryCountsByClickedBatchcodeProvider: class CountryCountsByClickedBatchcodeProvider:
@staticmethod @staticmethod
def getCountryCountsByClickedBatchcode(file): def getCountryCountsByClickedBatchcode(file):
if CountryCountsByClickedBatchcodeProvider._hasCityColumn(file): if ResolutionProvider.getResolution(file) == Resolution.CITY:
return CountryCountsByClickedBatchcodeProvider._getCountryCountsByClickedBatchcode_fromCityResolution(file) return CountryCountsByClickedBatchcodeProvider._getCountryCountsByClickedBatchcode_fromCityResolution(file)
else: else:
return CountryCountsByClickedBatchcodeProvider._getCountryCountsByClickedBatchcode_fromCountryResolution(file) return CountryCountsByClickedBatchcodeProvider._getCountryCountsByClickedBatchcode_fromCountryResolution(file)
@staticmethod
def _hasCityColumn(file):
return 'City' in CountryCountsByClickedBatchcodeProvider._read_raw_csv(file).columns
@staticmethod
def _read_raw_csv(file):
return pd.read_csv(file, index_col = 0, skiprows = [0, 1, 2, 3, 4, 5, 7])
@staticmethod @staticmethod
def _getCountryCountsByClickedBatchcode_fromCityResolution(file): def _getCountryCountsByClickedBatchcode_fromCityResolution(file):
cityCountsByClickedBatchcodeTable = CountryCountsByClickedBatchcodeProvider._getCityCountsByClickedBatchcode(file) cityCountsByClickedBatchcodeTable = CountryCountsByClickedBatchcodeProvider._getCityCountsByClickedBatchcode(file)
@@ -51,7 +44,7 @@ class CountryCountsByClickedBatchcodeProvider:
@staticmethod @staticmethod
def _read_csv(file, columns, index_columns): def _read_csv(file, columns, index_columns):
dataframe = CountryCountsByClickedBatchcodeProvider._read_raw_csv(file) dataframe = pd.read_csv(file, index_col = 0, skiprows = [0, 1, 2, 3, 4, 5, 7])
dataframe.index.name = 'VAX_LOT' dataframe.index.name = 'VAX_LOT'
dataframe.rename( dataframe.rename(
columns = columns, columns = columns,