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

fixed dirty attributes not resetting #712

Merged
merged 4 commits into from
Jun 8, 2022
Merged

fixed dirty attributes not resetting #712

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
8d3590b
fixed dirty attributes not resetting
josephmancuso Jun 8, 2022
cb875ac
added dirty attributes
josephmancuso Jun 8, 2022
45051e2
dirty attribute change
josephmancuso Jun 8, 2022
7994ffd
updated test for observers
josephmancuso Jun 8, 2022
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
1 change: 1 addition & 0 deletions src/masoniteorm/models/Model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,7 @@ def save(self, query=False):
)
self.observe_events(self, "saved")
self.fill(result.__attributes__)
self.__dirty_attributes__ = {}
return result

if self.is_loaded():
Expand Down
51 changes: 27 additions & 24 deletions tests/sqlite/models/test_observers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,45 @@
from tests.integrations.config.database import DB


class TestM:
pass

class UserObserver:
def created(self, user):
user.observed_created = 1
TestM.observed_created = 1

def creating(self, user):
user.observed_creating = 1
TestM.observed_creating = 1

def saving(self, user):
user.observed_saving = 1
TestM.observed_saving = 1

def saved(self, user):
user.observed_saved = 1
TestM.observed_saved = 1

def updating(self, user):
user.observed_updating = 1
TestM.observed_updating = 1

def updated(self, user):
user.observed_updated = 1
TestM.observed_updated = 1

def booted(self, user):
user.observed_booting = 1
TestM.observed_booting = 1

def booting(self, user):
user.observed_booted = 1
TestM.observed_booted = 1

def hydrating(self, user):
user.observed_hydrating = 1
TestM.observed_hydrating = 1

def hydrated(self, user):
user.observed_hydrated = 1
TestM.observed_hydrated = 1

def deleting(self, user):
user.observed_deleting = 1
TestM.observed_deleting = 1

def deleted(self, user):
user.observed_deleted = 1
TestM.observed_deleted = 1


class Observer(Model):
Expand All @@ -65,8 +68,8 @@ class BaseTestQueryRelationships(unittest.TestCase):
def test_created_is_observed(self):
# DB.begin_transaction("dev")
user = Observer.create({"name": "joe"})
self.assertEqual(user.observed_creating, 1)
self.assertEqual(user.observed_created, 1)
self.assertEqual(TestM.observed_creating, 1)
self.assertEqual(TestM.observed_created, 1)
# DB.rollback("dev")

def test_saving_is_observed(self):
Expand All @@ -76,8 +79,8 @@ def test_saving_is_observed(self):
user.name = "bill"
user.save()

self.assertEqual(user.observed_saving, 1)
self.assertEqual(user.observed_saved, 1)
self.assertEqual(TestM.observed_saving, 1)
self.assertEqual(TestM.observed_saved, 1)
# DB.rollback("dev")

def test_updating_is_observed(self):
Expand All @@ -86,8 +89,8 @@ def test_updating_is_observed(self):

re = user.update({"name": "bill"})

self.assertEqual(user.observed_updated, 1)
self.assertEqual(user.observed_updating, 1)
self.assertEqual(TestM.observed_updated, 1)
self.assertEqual(TestM.observed_updating, 1)
# DB.rollback("dev")

def test_booting_is_observed(self):
Expand All @@ -96,8 +99,8 @@ def test_booting_is_observed(self):

re = user.update({"name": "bill"})

self.assertEqual(user.observed_booting, 1)
self.assertEqual(user.observed_booted, 1)
self.assertEqual(TestM.observed_booting, 1)
self.assertEqual(TestM.observed_booted, 1)
# DB.rollback("dev")

def test_deleting_is_observed(self):
Expand All @@ -106,14 +109,14 @@ def test_deleting_is_observed(self):

re = user.delete()

self.assertEqual(user.observed_deleting, 1)
self.assertEqual(user.observed_deleted, 1)
self.assertEqual(TestM.observed_deleting, 1)
self.assertEqual(TestM.observed_deleted, 1)
DB.rollback("dev")

def test_hydrating_is_observed(self):
DB.begin_transaction("dev")
user = Observer.hydrate({"id": 10, "name": "joe"})

self.assertEqual(user.observed_hydrating, 1)
self.assertEqual(user.observed_hydrated, 1)
self.assertEqual(TestM.observed_hydrating, 1)
self.assertEqual(TestM.observed_hydrated, 1)
DB.rollback("dev")