Merge pull request open5e#765 from open5e/764-sort-fixture-keys-to-allow-for-easier-comparison

764 sort fixture keys to allow for easier comparison

Author: augustjohnson

api_v2/management/commands/export.py

@@ -210,7 +210,7 @@ def write_queryset_data(filepath, queryset, format='json'):
 
         with open(output_filepath, 'w', encoding='utf-8') as f:
             if format=='json':
-                serializers.serialize("json", queryset, indent=2, stream=f)
+                serializers.serialize("json", queryset, indent=2, stream=f, sort_keys=True)
             if format=='csv':
                 # Create headers:
                 fieldnames = []

api_v2/tests/responses/TestObjects.test_weapon_with_mastery_example.approved.json

@@ -28,21 +28,21 @@
     "long_range": 0.0,
     "name": "Longsword",
     "properties": [
-        {
-            "detail": "1d10",
-            "property": {
-                "name": "Versatile",
-                "type": null,
-                "url": "http://localhost:8000/v2/weaponproperties/srd-2024_versatile-wp/"
-            }
-        },
         {
             "detail": null,
             "property": {
                 "name": "Sap",
                 "type": "Mastery",
                 "url": "http://localhost:8000/v2/weaponproperties/srd-2024_sap-mastery/"
             }
+        },
+        {
+            "detail": "1d10",
+            "property": {
+                "name": "Versatile",
+                "type": null,
+                "url": "http://localhost:8000/v2/weaponproperties/srd-2024_versatile-wp/"
+            }
         }
     ],
     "range": 0.0,

data/v1/a5e/Background.json

@@ -1,19 +1,19 @@
 [
 {
-  "model": "api.document",
-  "pk": 39,
   "fields": {
-    "slug": "a5e",
-    "title": "Level Up Advanced 5e",
+    "author": "EN Publishing",
+    "copyright": "This work includes material taken from the A5E System Reference Document (A5ESRD) by EN Publishing and available at A5ESRD.com, based on Level Up: Advanced 5th Edition, available at www.levelup5e.com. The A5ESRD is licensed under the Creative Commons Attribution 4.0 International License available at https://creativecommons.org/licenses/by/4.0/legalcode.",
     "desc": "Advanced 5th Edition System Reference Document by EN Publishing",
     "license": "Creative Commons Attribution 4.0 International License",
-    "author": "EN Publishing",
+    "license_url": "http://open5e.com/legal",
     "organization": "EN Publishing™",
-    "version": "1.0",
+    "slug": "a5e",
+    "title": "Level Up Advanced 5e",
     "url": "https://a5esrd.com/a5esrd",
-    "copyright": "This work includes material taken from the A5E System Reference Document (A5ESRD) by EN Publishing and available at A5ESRD.com, based on Level Up: Advanced 5th Edition, available at www.levelup5e.com. The A5ESRD is licensed under the Creative Commons Attribution 4.0 International License available at https://creativecommons.org/licenses/by/4.0/legalcode.",
-    "license_url": "http://open5e.com/legal",
-    "v2_related_key": "a5e"
-  }
+    "v2_related_key": "a5e",
+    "version": "1.0"
+  },
+  "model": "api.document",
+  "pk": 39
 }
 ]

data/v1/a5e/Document.json

@@ -1,19 +1,19 @@
 [
 {
-  "model": "api.document",
-  "pk": 46,
   "fields": {
-    "slug": "blackflag",
-    "title": "Black Flag SRD",
+    "author": "Kobold Press",
+    "copyright": "ORC NOTICE: This product is licensed under the ORC License, located at the Library of Congress at TX 9-307-067, and available online at various locations including koboldpress.com/orclicense and others. All warranties are disclaimed as set forth therein.",
     "desc": "Black Flag Roleplaying Reference Document v0.2, © Open Design LLC d/b/a Kobold Press",
     "license": "ORC License",
-    "author": "Kobold Press",
+    "license_url": "https://paizo.com/orclicense",
     "organization": "Kobold Press™",
-    "version": "0.2",
+    "slug": "blackflag",
+    "title": "Black Flag SRD",
     "url": "https://koboldpress.com/black-flag-reference-document/",
-    "copyright": "ORC NOTICE: This product is licensed under the ORC License, located at the Library of Congress at TX 9-307-067, and available online at various locations including koboldpress.com/orclicense and others. All warranties are disclaimed as set forth therein.",
-    "license_url": "https://paizo.com/orclicense",
-    "v2_related_key": "bfrd"
-  }
+    "v2_related_key": "bfrd",
+    "version": "0.2"
+  },
+  "model": "api.document",
+  "pk": 46
 }
 ]

data/v1/a5e/Feat.json

@@ -1,19 +1,19 @@
 [
 {
-  "model": "api.document",
-  "pk": 34,
   "fields": {
-    "slug": "cc",
-    "title": "Creature Codex",
+    "author": "Wolfgang Baur, Dan Dillon, Richard Green, James Haeck, Chris Harris, Jeremy Hochhalter, James Introcaso, Chris Lockey, Shawn Merwin, and Jon Sawatsky",
+    "copyright": "Creature Codex. © 2018 Open Design LLC; Authors Wolfgang Baur, Dan Dillon, Richard Green, James Haeck, Chris Harris, Jeremy Hochhalter, James Introcaso, Chris Lockey, Shawn Merwin, and Jon Sawatsky.",
     "desc": "Creature Codex Open-Gaming License Content by Kobold Press",
     "license": "Open Gaming License",
-    "author": "Wolfgang Baur, Dan Dillon, Richard Green, James Haeck, Chris Harris, Jeremy Hochhalter, James Introcaso, Chris Lockey, Shawn Merwin, and Jon Sawatsky",
+    "license_url": "http://open5e.com/legal",
     "organization": "Kobold Press™",
-    "version": "1.0",
+    "slug": "cc",
+    "title": "Creature Codex",
     "url": "https://koboldpress.com/kpstore/product/creature-codex-for-5th-edition-dnd/",
-    "copyright": "Creature Codex. © 2018 Open Design LLC; Authors Wolfgang Baur, Dan Dillon, Richard Green, James Haeck, Chris Harris, Jeremy Hochhalter, James Introcaso, Chris Lockey, Shawn Merwin, and Jon Sawatsky.",
-    "license_url": "http://open5e.com/legal",
-    "v2_related_key": "ccdx"
-  }
+    "v2_related_key": "ccdx",
+    "version": "1.0"
+  },
+  "model": "api.document",
+  "pk": 34
 }
 ]