New account

api/apps.py

@@ -20,5 +20,7 @@ class ApiConfig(AppConfig):
     def ready(self):
         """Create the anonymous user if they don't exist."""
 
-        if not 'test' in sys.argv:
-            post_migrate.connect(populate_models, sender=self)
+        if 'test' in sys.argv or 'loaddata' in sys.argv or 'flush' in sys.argv:
+            return
+        else:
+           post_migrate.connect(populate_models, sender=self)

api/model/groups.py

@@ -448,7 +448,10 @@ def associate_user_group(sender, instance, created, **kwargs):
     if the user isn't anon or the already existent bco_drafter or bco_publisher.
     """
 
-    if not 'test' in sys.argv:
+    if 'test' in sys.argv or 'loaddata' in sys.argv:
+        return
+
+    else:
         if created:
             print(instance)
             Group.objects.create(name=instance)

api/model/prefix.py

@@ -681,7 +681,10 @@ def create_permissions_for_prefix(sender, instance=None, **kwargs):
     #         owner_user=User.objects.get(username='wheel')
     #     )
 
-    if not 'test' in sys.argv:
+    if 'test' in sys.argv or 'loaddata' in sys.argv:
+        return
+
+    else:
         owner_user = User.objects.get(username=instance.owner_user)
         owner_group = Group.objects.get(name=instance.owner_group_id)
         drafters = Group.objects.get(name=instance.prefix.lower() + "_drafter")
@@ -720,7 +723,9 @@ def create_counter_for_prefix(sender, instance=None, created=False, **kwargs):
         instance: api.model.prefix.Prefix
         created: bool
     """
-    if not 'test' in sys.argv:
+    if 'test' in sys.argv or 'loaddata' in sys.argv or 'flush' in sys.argv:
+            return
+    else:
         if created:
             prefix_table.objects.create(n_objects=1, prefix=instance.prefix)
 

api/models.py

@@ -21,6 +21,7 @@
 Source: https://www.django-rest-framework.org/api-guide/authentication/#generating-tokens
 """
 
+import sys
 from django.db import models
 from django.conf import settings
 from django.contrib.auth.models import Group, User
@@ -125,15 +126,18 @@ def create_auth_token(sender, instance=None, created=False, **kwargs):
     """Link user creation to token generation.
     Source: https://www.django-rest-framework.org/api-guide/authentication/#generating-tokens
     """
-    if created:
-        # The anonymous user's token is hard-coded
-        # in server.conf.
-        if instance.username == "anon":
-            # Create anon's record with the hard-coded key.
-            Token.objects.create(user=instance, key=settings.ANON_KEY)
-        else:
-            # Create a normal user's record.
-            Token.objects.create(user=instance)
+    if 'loaddata' in sys.argv:
+        return
+    else:
+        if created:
+            # The anonymous user's token is hard-coded
+            # in server.conf.
+            if instance.username == "anon":
+                # Create anon's record with the hard-coded key.
+                Token.objects.create(user=instance, key=settings.ANON_KEY)
+            else:
+                # Create a normal user's record.
+                Token.objects.create(user=instance)
 
 
 # Link object deletion to object permissions deletion.

api/scripts/utilities/DbUtils.py

@@ -731,7 +731,10 @@ def messages(self, parameters, p_content=False):
                 "status_code": "409",
                 "message": "The provided object "
                 + parameters["object_id"]
-                + " has already been created on this server.",
+                + " has already been created on this server."
+                + " If you wish to publish a new version of this BCO try"
+                + " to save the DRAFT with a different version number, and"
+                + " then resubmit.",
             },
             "409_draft_object_id_conflict": {
                 "request_status": "FAILURE",