Skip to content

Commit ae32734

Browse files
committed
fix missing entity type
1 parent e5797ed commit ae32734

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

functions-python/operations_api/.openapi-generator/FILES

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ src/feeds_gen/models/basic_dataset.py
77
src/feeds_gen/models/basic_feed.py
88
src/feeds_gen/models/bounding_box.py
99
src/feeds_gen/models/data_type.py
10-
src/feeds_gen/models/entity_type.py
1110
src/feeds_gen/models/external_id.py
1211
src/feeds_gen/models/extra_models.py
1312
src/feeds_gen/models/feed.py
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from pydantic import BaseModel
22

3-
from feeds_gen.models.entity_type import EntityType
43
from shared.database_gen.sqlacodegen_models import Entitytype as EntityTypeOrm
54

65

@@ -17,26 +16,22 @@ class Config:
1716
from_attributes = True
1817

1918
@classmethod
20-
def from_orm(cls, obj: EntityTypeOrm | None) -> EntityType | None:
19+
def from_orm(cls, obj: EntityTypeOrm | None) -> str | None:
2120
"""
2221
Convert a SQLAlchemy row object to a Pydantic model.
2322
"""
2423
if obj is None:
2524
return None
26-
return EntityType(obj.name.lower())
25+
return obj.name
2726

2827
@classmethod
29-
def to_orm(cls, entity_type: EntityType, session) -> EntityTypeOrm:
28+
def to_orm(cls, entity_type: str, session) -> EntityTypeOrm:
3029
"""
3130
Convert a Pydantic model to a SQLAlchemy row object.
3231
"""
3332
result = (
3433
session.query(EntityTypeOrm)
35-
.filter(EntityTypeOrm.name.ilike(entity_type.name))
34+
.filter(EntityTypeOrm.name.ilike(entity_type))
3635
.first()
3736
)
38-
return (
39-
result
40-
if result is not None
41-
else EntityTypeOrm(name=entity_type.name.lower())
42-
)
37+
return result if result is not None else EntityTypeOrm(name=entity_type.lower())

0 commit comments

Comments
 (0)