Skip to content

fix: Update battery collection enum naming and add increment to rank for same class enum #80

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

Merged
mcllerena merged 4 commits into from
Dec 6, 2025
Merged

fix: Update battery collection enum naming and add increment to rank for same class enum #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f4e7ee
fix: include battery collection enum to defaults
mcllerena Dec 4, 2025
93d78c6
fix: add increment to rank when having same class enum
mcllerena Dec 6, 2025
8cd6156
Merge branch 'main' into ml/fix-battery-enum
mcllerena Dec 6, 2025
1d55f64
fix: run pre-commit for mypy compilation
mcllerena Dec 6, 2025
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
2 changes: 1 addition & 1 deletion src/plexosdb/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def add_category(self, class_enum: ClassEnum, /, name: str) -> int:
return self.get_category_id(class_enum, name)

class_id = self.get_class_id(class_enum)
rank = self.get_category_max_id(class_enum) or 1 # Default to max rank of 1 if no category exists
rank = self.get_category_max_id(class_enum) + 1 or 1 # Default to max rank of 1 if no category exists
params = (class_id, name, rank)
placeholders = ", ".join("?" * len(params))
query = f"INSERT INTO {Schema.Categories.name}(class_id, name, rank) VALUES({placeholders})"
Expand Down
11 changes: 8 additions & 3 deletions src/plexosdb/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,14 @@ def str2enum(string: str, schema_enum: type[Enum] = Schema) -> Schema | None:

def get_default_collection(class_enum: ClassEnum) -> CollectionEnum:
"""Return default collection for class."""
# Special case for Data File
if class_enum == ClassEnum.DataFile:
return CollectionEnum.DataFiles
# Special cases for Data File and Battery objects
special_cases = {
ClassEnum.DataFile: CollectionEnum.DataFiles,
ClassEnum.Battery: CollectionEnum.Batteries,
}

if class_enum in special_cases:
return special_cases[class_enum]

collection_name = f"{class_enum}s"
if collection_name not in CollectionEnum.__members__:
Expand Down