Skip to content

Commit e156f7f

Browse files
committed
#759 More case insensitivity stuff
1 parent 9aa02f2 commit e156f7f

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/backend_data_retrieval/data_retrieval_app/data_deposit/modifier/modifier_data_depositor.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,11 @@ def _remove_duplicates(self, new_modifiers_df: pd.DataFrame) -> pd.DataFrame:
178178
return new_modifiers_df
179179

180180
logger.info("Removing duplicate modifiers")
181-
duplicate_mask = new_modifiers_df["effect"].isin(current_modifiers_df["effect"])
181+
duplicate_mask = (
182+
new_modifiers_df["effect"]
183+
.str.lower()
184+
.isin(current_modifiers_df["effect"].str.lower())
185+
)
182186

183187
duplicate_df = new_modifiers_df.loc[duplicate_mask].copy()
184188
self._update_duplicates(duplicate_df, current_modifiers_df)

src/backend_data_retrieval/data_retrieval_app/data_deposit/modifier/modifier_processing_modules.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,12 @@ def check_for_updated_text_rolls(
238238
logger.info(
239239
f"Found a modifier with new 'textRolls'. Modifier: {data['effect']}"
240240
)
241-
new_rolls = row_new["textRolls"].split("|")
242-
old_rolls = data["textRolls"].split("|")
241+
new_rolls: list[str] = row_new["textRolls"].split("|")
242+
old_rolls: list[str] = data["textRolls"].split("|")
243243
combined_rolls = old_rolls + [
244-
roll for roll in new_rolls if roll not in old_rolls
244+
roll
245+
for roll in new_rolls
246+
if roll.lower() not in [old_roll.lower() for old_roll in old_rolls]
245247
]
246248
if rolls is not None:
247249
rolls[int(data["position"])] = "|".join(combined_rolls)

0 commit comments

Comments
 (0)