'Add' instead of 'merge' transient object into session

SURFscz · Jun 6, 2024 · cfdfedd · cfdfedd
1 parent 388353f
commit cfdfedd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/server/api/collaboration.py b/server/api/collaboration.py
@@ -487,7 +487,7 @@ def collaboration_invites():
                                 intended_role=intended_role, expiry_date=default_expiry_date(json_dict=data),
                                 membership_expiry_date=membership_expiry_date, created_by=user.uid,
                                 external_identifier=str(uuid.uuid4()))
-        invitation = db.session.merge(invitation)
+        db.session.add(invitation)
         invitation.groups.extend(groups)
         db.session.commit()
         mail_collaboration_invitation({

diff --git a/server/api/invitation.py b/server/api/invitation.py
@@ -217,7 +217,7 @@ def collaboration_invites_api():
                                 expiry_date=expiry_date, membership_expiry_date=membership_expiry_date,
                                 created_by=CREATED_BY_SYSTEM, external_identifier=str(uuid.uuid4()), status="open")
         invitation.groups.extend(groups)
-        invitation = db.session.merge(invitation)
+        db.session.add(invitation)
         invites_results.append({
             "email": email,
             "invitation_expiry_date": expiry_date,

diff --git a/server/api/organisation.py b/server/api/organisation.py
@@ -343,7 +343,7 @@ def organisation_invites():
                                             user=user,
                                             expiry_date=default_expiry_date(json_dict=data),
                                             created_by=user.uid)
-        invitation = db.session.merge(invitation)
+        db.session.add(invitation)
         mail_organisation_invitation({
             "salutation": "Dear",
             "invitation": invitation,

diff --git a/server/api/service.py b/server/api/service.py
@@ -520,7 +520,7 @@ def service_invites():
                                        intended_role=intended_role,
                                        created_by=user.uid,
                                        expiry_date=default_expiry_date(json_dict=data))
-        invitation = db.session.merge(invitation)
+        db.session.add(invitation)
         mail_service_invitation({
             "salutation": "Dear",
             "invitation": invitation,

diff --git a/server/cron/user_suspending.py b/server/cron/user_suspending.py
@@ -19,7 +19,8 @@ def create_suspend_notification(user, retention, app, is_warning, is_suspension)
                                                sent_at=dt_now(),
                                                is_warning=is_warning,
                                                is_suspension=is_suspension)
-    user.suspend_notifications.append(suspend_notification)
+    db.session.add(suspend_notification)
+    # user.suspend_notifications.append(suspend_notification)
     db.session.merge(user)
 
     logger = logging.getLogger("scheduler")