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

LITE-30014 Transactional verbose_id is using wrong base id body reference #4

Merged
merged 1 commit into from
Apr 25, 2024
Merged

LITE-30014 Transactional verbose_id is using wrong base id body reference #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 23 additions & 25 deletions connect_extension_utils/db/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,12 @@ def add_next_with_verbose(self, instance, related_id_field):
instance_class = instance.__class__
new_suffix = 0
related_id_value = getattr(instance, related_id_field)
if self.query(
self.query(instance_class)
.filter(instance_class.__dict__[related_id_field] == related_id_value)
.exists(),
).scalar():
last_obj = (
self.query(instance_class)
.order_by(
instance_class.id.desc(),
)
.first()
)
last_obj = self._get_last_obj_for_next_verbose(
instance_class,
related_id_field,
related_id_value,
)
if last_obj:
_instance_id, suffix = last_obj.id.rsplit("-", 1)
new_suffix = int(suffix) + 1
else:
Expand All @@ -121,19 +115,12 @@ def add_all_with_next_verbose(self, instances, related_id_field):
instance_class = first_item.__class__
new_suffix = 0
related_id_value = getattr(first_item, related_id_field)

if self.query(
self.query(instance_class)
.filter(instance_class.__dict__[related_id_field] == related_id_value)
.exists(),
).scalar():
last_obj = (
self.query(instance_class)
.order_by(
instance_class.id.desc(),
)
.first()
)
last_obj = self._get_last_obj_for_next_verbose(
instance_class,
related_id_field,
related_id_value,
)
if last_obj:
_instance_id, suffix = last_obj.id.rsplit("-", 1)
new_suffix = int(suffix) + 1
else:
Expand All @@ -146,6 +133,17 @@ def add_all_with_next_verbose(self, instances, related_id_field):

return self.add_all(instances)

def _get_last_obj_for_next_verbose(self, model_class, related_id_field, related_id_value):
base_qs = self.query(model_class).filter(
model_class.__dict__[related_id_field] == related_id_value,
)
last_obj = None
if self.query(base_qs.exists()).scalar():
last_obj = base_qs.order_by(
model_class.id.desc(),
).first()
return last_obj


SessionLocal = sessionmaker(autocommit=False, autoflush=False, class_=VerboseBaseSession)
Model = declarative_base()
Expand Down
24 changes: 12 additions & 12 deletions connect_extension_utils/testing/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,32 +38,32 @@ class Meta:

@classmethod
def _save(cls, model_class, session, args, kwargs):
obj = model_class(*args, **kwargs)
save_method = None
if cls._meta._is_transactional:
obj = model_class(*args, **kwargs)
kwargs['id'] = cls.add_next_with_verbose(
model_class,
session,
obj,
cls._meta._related_id_field,
)
return super()._save(model_class, session, args, kwargs)
save_method = factory.alchemy.SQLAlchemyModelFactory.__dict__['_save']
cls.save_method = save_method or super()._save
return cls.save_method(model_class, session, args, kwargs)

@classmethod
def add_next_with_verbose(cls, model_class, session, obj, related_id_field):
new_suffix = 0
related_id_value = getattr(obj, related_id_field)
base_qs = session.query(model_class).filter(
model_class.__dict__[related_id_field] == related_id_value,
)
if session.query(
session.query(model_class)
.filter(model_class.__dict__[related_id_field] == related_id_value)
.exists(),
base_qs.exists(),
).scalar():
last_obj = (
session.query(model_class)
.order_by(
model_class.id.desc(),
)
.first()
)
last_obj = base_qs.order_by(
model_class.id.desc(),
).first()
_instance_id, suffix = last_obj.id.rsplit("-", 1)
new_suffix = int(suffix) + 1
else:
Expand Down
40 changes: 30 additions & 10 deletions tests/db/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ def test_add_verbose_bulk(dbsession):


def test_add_with_next_verbose(dbsession):
obj = MyModel(
name='Foo',
created_by='Jony',
)
obj = MyModel(name='Foo', created_by='Jony')
obj_2 = MyModel(name='Bar', created_by='Neri')
dbsession.add_with_verbose(obj)
dbsession.add_with_verbose(obj_2)
dbsession.commit()
trx_obj = TransactionalModel(
my_model_id=obj.id,
Expand All @@ -55,37 +54,58 @@ def test_add_with_next_verbose(dbsession):
)
dbsession.add_next_with_verbose(trx_obj_2, related_id_field='my_model_id')
dbsession.commit()
trx_obj_3 = TransactionalModel(
my_model_id=obj_2.id,
)
dbsession.add_next_with_verbose(trx_obj_3, related_id_field='my_model_id')
dbsession.commit()
assert trx_obj.id.startswith(TransactionalModel.PREFIX)
assert trx_obj.id.endswith('000')
assert obj.id.split('-', 1)[-1] in trx_obj.id
assert trx_obj_2.id.startswith(TransactionalModel.PREFIX)
assert trx_obj_2.id.endswith('001')
assert obj.id.split('-', 1)[-1] in trx_obj_2.id
assert trx_obj_3.id.startswith(TransactionalModel.PREFIX)
assert trx_obj_3.id.endswith('000')
assert obj_2.id.split('-', 1)[-1] in trx_obj_3.id


def test_add_with_next_verbose_bulk(dbsession):
m_obj = MyModel(
name='Foo',
created_by='Jony',
)
dbsession.add_with_verbose(m_obj)
m_obj2 = MyModel(name='Bar', created_by='Neri')
dbsession.add_all_with_verbose([m_obj, m_obj2])
dbsession.commit()

trx_1 = TransactionalModel(my_model_id=m_obj.id)
dbsession.add_next_with_verbose(
trx_1,
related_id_field='my_model_id',
)
dbsession.commit()

instances = []
for _ in range(3):
instances.append(
TransactionalModel(
my_model_id=m_obj.id,
my_model_id=m_obj2.id,
),
)
dbsession.add_all_with_next_verbose(instances, related_id_field='my_model_id')
dbsession.commit()
for idx, obj in enumerate(instances):
assert obj.id.startswith(TransactionalModel.PREFIX)
assert obj.id.endswith(f'00{idx}')
assert m_obj2.id.split('-', 1)[-1] in obj.id

new_obj = TransactionalModel(my_model_id=m_obj.id)
dbsession.add_all_with_next_verbose([new_obj], related_id_field='my_model_id')
new_trx_obj = TransactionalModel(my_model_id=m_obj.id)
dbsession.add_all_with_next_verbose([new_trx_obj], related_id_field='my_model_id')
dbsession.commit()
assert new_obj.id.startswith(TransactionalModel.PREFIX)
assert new_obj.id.endswith('003')
assert new_trx_obj.id.startswith(TransactionalModel.PREFIX)
assert new_trx_obj.id.endswith('001')
assert m_obj.id.split('-', 1)[-1] in new_trx_obj.id


def test_add_with_verbose_bulk_fail_instances_not_same_class(dbsession):
Expand Down
6 changes: 5 additions & 1 deletion tests/testing/test_factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ def test_model_factory(my_model_factory):
assert obj.name.startswith("My Model")


def test_related_model_factory(my_model_factory, related_model_factory):
def test_related_model_factory(my_model_factory, related_model_factory, dbsession):
rel_obj = related_model_factory()
assert rel_obj.id.startswith(related_model_factory._meta.model.PREFIX)
assert rel_obj.my_model_id.startswith(my_model_factory._meta.model.PREFIX)
assert dbsession.query(related_model_factory._meta.model).count() == 1
assert dbsession.query(my_model_factory._meta.model).count() == 1


def test_transactional_model_factory(
Expand All @@ -24,3 +26,5 @@ def test_transactional_model_factory(
_, body = base.split("-", 1)
assert trx_obj.my_model_id == f"{my_model_factory._meta.model.PREFIX}-{body}"
assert id_suffix == f"00{suffix}"
assert dbsession.query(my_model_factory._meta.model).count() == 1
assert dbsession.query(transactional_model_factory._meta.model).count() == 3
Loading