From 5a224b5aa4bc9cf60f9d06aa38cefe41384cec15 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 7 Sep 2021 10:09:28 -0700
Subject: [PATCH] Use atomic when creating new users

---
 bookwyrm/models/user.py | 67 ++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 0745dffa..7756846f 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -274,30 +274,46 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             transaction.on_commit(lambda: set_remote_server.delay(self.id))
             return
 
-        # populate fields for local users
-        link = site_link()
-        self.remote_id = f"{link}/user/{self.localname}"
-        self.followers_url = f"{self.remote_id}/followers"
-        self.inbox = f"{self.remote_id}/inbox"
-        self.shared_inbox = f"{link}/inbox"
-        self.outbox = f"{self.remote_id}/outbox"
+        with transaction.atomic():
+            # populate fields for local users
+            link = site_link()
+            self.remote_id = f"{link}/user/{self.localname}"
+            self.followers_url = f"{self.remote_id}/followers"
+            self.inbox = f"{self.remote_id}/inbox"
+            self.shared_inbox = f"{link}/inbox"
+            self.outbox = f"{self.remote_id}/outbox"
 
-        # an id needs to be set before we can proceed with related models
+            # an id needs to be set before we can proceed with related models
+            super().save(*args, **kwargs)
+
+            # make users editors by default
+            try:
+                self.groups.add(Group.objects.get(name="editor"))
+            except Group.DoesNotExist:
+                # this should only happen in tests
+                pass
+
+            # create keys and shelves for new local users
+            self.key_pair = KeyPair.objects.create(
+                remote_id=f"{self.remote_id}/#main-key"
+            )
+            self.save(broadcast=False, update_fields=["key_pair"])
+
+            self.create_shelves()
+
+    def delete(self, *args, **kwargs):
+        """deactivate rather than delete a user"""
+        self.is_active = False
+        # skip the logic in this class's save()
         super().save(*args, **kwargs)
 
-        # make users editors by default
-        try:
-            self.groups.add(Group.objects.get(name="editor"))
-        except Group.DoesNotExist:
-            # this should only happen in tests
-            pass
-
-        # create keys and shelves for new local users
-        self.key_pair = KeyPair.objects.create(
-            remote_id="%s/#main-key" % self.remote_id
-        )
-        self.save(broadcast=False, update_fields=["key_pair"])
+    @property
+    def local_path(self):
+        """this model doesn't inherit bookwyrm model, so here we are"""
+        return "/user/%s" % (self.localname or self.username)
 
+    def create_shelves(self):
+        """default shelves for a new user"""
         shelves = [
             {
                 "name": "To Read",
@@ -321,17 +337,6 @@ class User(OrderedCollectionPageMixin, AbstractUser):
                 editable=False,
             ).save(broadcast=False)
 
-    def delete(self, *args, **kwargs):
-        """deactivate rather than delete a user"""
-        self.is_active = False
-        # skip the logic in this class's save()
-        super().save(*args, **kwargs)
-
-    @property
-    def local_path(self):
-        """this model doesn't inherit bookwyrm model, so here we are"""
-        return "/user/%s" % (self.localname or self.username)
-
 
 class KeyPair(ActivitypubMixin, BookWyrmModel):
     """public and private keys for a user"""