You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2024/07/02 22:41:15 UTC
(allura) 03/03: fixup! update ming calls from find_and_modify to find_one_and_update
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8565
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 8b6f7a8da8245cc51c4d17f98f1d499bbf1be954
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Tue Jul 2 18:41:03 2024 -0400
fixup! update ming calls from find_and_modify to find_one_and_update
---
Allura/allura/model/auth.py | 2 +-
Allura/allura/model/monq_model.py | 2 +-
Allura/allura/model/notification.py | 5 ++---
Allura/allura/model/repository.py | 2 +-
ForgeImporters/forgeimporters/base.py | 4 ++--
ForgeTracker/forgetracker/model/ticket.py | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index cb797e776..17818c829 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -219,7 +219,7 @@ class AuthGlobals(MappedClass):
cls.upsert()
g = cls.query.find_one_and_update(
{}, update={'$inc': {'next_uid': 1}},
- new=True)
+ return_document=True)
return g.next_uid
diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py
index 17b4aa47e..4dbc532dc 100644
--- a/Allura/allura/model/monq_model.py
+++ b/Allura/allura/model/monq_model.py
@@ -206,7 +206,7 @@ class MonQTask(MappedClass):
state='busy',
process=process)
},
- new=True,
+ return_document=True,
sort=cls.sort)
if obj is not None:
return obj
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index 942a34b66..5b08cf1e8 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -597,8 +597,7 @@ class Mailbox(MappedClass):
update={'$set': dict(
queue=[],
queue_empty=True,
- )},
- new=False)
+ )})
for mbox in take_while_true(find_and_modify_direct_mbox):
try:
@@ -625,7 +624,7 @@ class Mailbox(MappedClass):
queue=[],
queue_empty=True,
)},
- new=False)
+ )
mbox.fire(now)
def fire(self, now):
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 3266fe0a8..e51cdcd60 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -1075,7 +1075,7 @@ class CommitStatus(MappedClass):
obj = cls.query.find_one_and_update(
dict(commit_id=kw.get('commit_id'), context=kw.get('context')),
update={'$set': kw},
- new=True,
+ return_document=True,
upsert=True,
)
return obj
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 7c87c6a78..db14405df 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -475,7 +475,7 @@ class ToolImporter(metaclass=ToolImporterMeta):
],
},
update={'$inc': {pending_key: 1}},
- new=True,
+ return_document=True,
)
return modified_project is not None
@@ -488,7 +488,7 @@ class ToolImporter(metaclass=ToolImporterMeta):
M.Project.query.find_one_and_update(
{'_id': project._id},
update={'$inc': {pending_key: -1}},
- new=True,
+ return_document=True,
)
def import_tool(self, project, user, project_name=None,
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 01714d071..1b80511d8 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -142,7 +142,7 @@ class Globals(MappedClass):
gbl = Globals.query.find_one_and_update(
dict(app_config_id=self.app_config_id),
update={'$inc': {'last_ticket_num': 1}},
- new=True)
+ return_document=True)
session(gbl).expunge(gbl)
return gbl.last_ticket_num