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-03-29 16:37:39 +02:00
parent d66ce311a3
commit c2575da22b
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/CountriesByBatchcodeProvider.py
View File

@@ -5,27 +5,24 @@ from CountriesColumnAdder import CountriesColumnAdder
from BatchCodeTableFactory import BatchCodeTableFactory from BatchCodeTableFactory import BatchCodeTableFactory
def getCountriesByCompletedBatchcode(internationalVaersCovid19): def getCountriesByCompletedBatchcode(internationalVaersCovid19):
batchCodeTable = BatchCodeTableFactory(internationalVaersCovid19).createGlobalBatchCodeTable() result = _readExploration('data/Country By Batchcode Search Term.csv', indexName = 'Batchcode Search Term')
country_By_Batchcode_Search_Term = _readExploration('data/Country By Batchcode Search Term.csv', indexName = 'Batchcode Search Term') result = _addCompletedBatchcodeColumn(result, internationalVaersCovid19)
completedBatchcodeColumnAdder = CompletedBatchcodeColumnAdder(BatchcodeCompletion(ADR_by_Batchcode = batchCodeTable).completeBatchcode)
country_By_Batchcode_Search_Term = completedBatchcodeColumnAdder.addCompletedBatchcodeColumn(country_By_Batchcode_Search_Term)
columnName = 'Countries' columnName = 'Countries'
country_By_Batchcode_Search_Term = CountriesColumnAdder().addCountriesColumn( result = CountriesColumnAdder().addCountriesColumn(result, columnName = columnName)
country_By_Batchcode_Search_Term, return result[[columnName]].droplevel('Batchcode Search Term')
columnName = columnName)
country_By_Batchcode_Search_Term = country_By_Batchcode_Search_Term[[columnName]].droplevel('Batchcode Search Term')
return country_By_Batchcode_Search_Term
def _addCompletedBatchcodeColumn(country_By_Batchcode_Search_Term, internationalVaersCovid19):
return CompletedBatchcodeColumnAdder(_getCompleteBatchcode(internationalVaersCovid19)).addCompletedBatchcodeColumn(country_By_Batchcode_Search_Term)
def _getCompleteBatchcode(internationalVaersCovid19):
batchCodeTable = BatchCodeTableFactory(internationalVaersCovid19).createGlobalBatchCodeTable()
return BatchcodeCompletion(ADR_by_Batchcode = batchCodeTable).completeBatchcode
def getCountriesByClickedBatchcode(): def getCountriesByClickedBatchcode():
country_By_Clicked_Batchcode = _readExploration( result = _readExploration('data/Country By Clicked Batchcode.csv', indexName = 'Clicked Batchcode')
'data/Country By Clicked Batchcode.csv',
indexName = 'Clicked Batchcode')
columnName = 'Countries' columnName = 'Countries'
country_By_Clicked_Batchcode = CountriesColumnAdder().addCountriesColumn( result = CountriesColumnAdder().addCountriesColumn(result, columnName = columnName)
country_By_Clicked_Batchcode, return result[[columnName]]
columnName = columnName)
country_By_Clicked_Batchcode = country_By_Clicked_Batchcode[[columnName]]
return country_By_Clicked_Batchcode
def _readExploration(csvFile, indexName): def _readExploration(csvFile, indexName):
exploration = pd.read_csv(csvFile, header=[0], index_col=0, skiprows=6, on_bad_lines='warn') exploration = pd.read_csv(csvFile, header=[0], index_col=0, skiprows=6, on_bad_lines='warn')