Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix upload icbc #964

Merged
merged 8 commits into from
Dec 7, 2021
Merged

Fix upload icbc #964

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6386b80
Changed how the csv is being read
amichard Nov 29, 2021
eaadc1f
Further performance optimization
amichard Nov 30, 2021
edd28ab
Added keep alive function back
amichard Nov 30, 2021
12deed7
Fixed merge conflicts
amichard Nov 30, 2021
b33c4fe
Increased worker timeout
amichard Nov 30, 2021
12f3220
Merge remote-tracking branch 'upstream/release-1.34.0' into fix-uploa…
amichard Nov 30, 2021
471ef14
Restored the previous way of filtering electic vehicles
amichard Dec 7, 2021
e1e82e6
Merge remote-tracking branch 'upstream/release-1.34.0' into fix-uploa…
amichard Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions backend/api/services/icbc_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,17 @@ def ingest_icbc_spreadsheet(excelfile, requesting_user, dateCurrentTo):

df.query('MODEL_YEAR > 2018', inplace=True)
# df = df[(df.MODEL_YEAR > 2018)]
df.query('MODEL_YEAR > 2018', inplace=True)
df.query('HYBRID_VEHICLE_FLAG != "N"', inplace=True)
df.query('ELECTRIC_VEHICLE_FLAG != "N"', inplace=True)
df['FUEL_TYPE'] = df['FUEL_TYPE'].str.upper()
df.query('FUEL_TYPE in ["ELECTRIC", "HYDROGEN", "GASOLINEELECTRIC"]')
# df = df[
# (df.HYBRID_VEHICLE_FLAG != 'N') |
# (df.ELECTRIC_VEHICLE_FLAG != 'N') |
# (df.FUEL_TYPE.str.upper() == 'ELECTRIC') |
# (df.FUEL_TYPE.str.upper() == 'HYDROGEN') |
# (df.FUEL_TYPE.str.upper() == 'GASOLINEELECTRIC')
# ]
# df.query('HYBRID_VEHICLE_FLAG != "N"', inplace=True)
# df.query('ELECTRIC_VEHICLE_FLAG != "N"', inplace=True)
# df['FUEL_TYPE'] = df['FUEL_TYPE'].str.upper()
# df.query('FUEL_TYPE in ["ELECTRIC", "HYDROGEN", "GASOLINEELECTRIC"]')
df = df[
(df.HYBRID_VEHICLE_FLAG != 'N') |
(df.ELECTRIC_VEHICLE_FLAG != 'N') |
(df.FUEL_TYPE.str.upper() == 'ELECTRIC') |
(df.FUEL_TYPE.str.upper() == 'HYDROGEN') |
(df.FUEL_TYPE.str.upper() == 'GASOLINEELECTRIC')
]
df.query('VIN != 0')
# df = df[(df.VIN != 0)]

Expand Down