Fixed duplicated Elderberry Inn Icons source (open5e#726)

* fixed duplicated elderberry inn icons source

* added ImageSummarySerializer

Author: calumbell

api_v2/serializers/condition.py

@@ -6,12 +6,12 @@
 
 from .abstracts import GameContentSerializer
 from .document import DocumentSummarySerializer
-from .image import ImageSerializer
+from .image import ImageSummarySerializer
 
 class ConditionSerializer(GameContentSerializer):
     key = serializers.ReadOnlyField()
     document = DocumentSummarySerializer()
-    icon = ImageSerializer()
+    icon = ImageSummarySerializer()
 
     class Meta:
         model = models.Condition

api_v2/serializers/image.py

@@ -2,13 +2,20 @@
 
 from rest_framework import serializers
 from .abstracts import GameContentSerializer
+from .document import DocumentSummarySerializer
 
 from api_v2 import models
 
+class ImageSummarySerializer(GameContentSerializer):
+    class Meta:
+        model = models.Image
+        fields = ['name', 'key', 'url', 'file_url', 'alt_text', 'attribution']
+
 class ImageSerializer(GameContentSerializer):
     key = serializers.ReadOnlyField()
     file_url = serializers.ReadOnlyField()
+    document = DocumentSummarySerializer()
 
     class Meta:
         model = models.Image
-        fields = ['name', 'key', 'file_url', 'alt_text', 'attribution']
+        fields = ['name', 'key', 'file_url', 'alt_text', 'attribution', 'document']

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

@@ -20,7 +20,8 @@
         "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
         "file_url": "/static/img/object_icons/elderberry-inn-icons/conditions/stunned.svg",
         "key": "elderberry_stunned",
-        "name": "Stunned"
+        "name": "Stunned",
+        "url": "http://localhost:8000/v2/images/elderberry_stunned/"
     },
     "key": "stunned",
     "name": "Stunned",

data/v2/open5e/elderberry/Image.json renamed to data/v2/open5e/elderberry-inn-icons/Image.json

@@ -4,7 +4,7 @@
   "pk": "elderberry_blinded",
   "fields": {
     "name": "Blinded",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/blinded.svg",
     "alt_text": "An icon representing the blinded condition in an RPG. A simple, abstract black-and-white icon of an eye with a line crossed through it.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -16,7 +16,7 @@
   "pk": "elderberry_charmed",
   "fields": {
     "name": "Charmed",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/charmed.svg",
     "alt_text": "An icon representing the charmed condition in an RPG. A simple black-and-white silhouette of a humanoid facing the viewer. There is a heart where their face should be.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -28,7 +28,7 @@
   "pk": "elderberry_deaftened",
   "fields": {
     "name": "Deaftened",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/deaftened.svg",
     "alt_text": "An icon representing the deafened condition in an RPG. A simple black-and-white outline of an ear with a diagonal line passing through it, as if it were crossed out.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -40,7 +40,7 @@
   "pk": "elderberry_exhaustion1",
   "fields": {
     "name": "Exhaustion1",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/exhaustion1.svg",
     "alt_text": "An icon representing the Exhaustion (one level) condition. A simple black-and-white diagram of a standing figure hunched over in exhaustion with a large numeral '1'.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -52,7 +52,7 @@
   "pk": "elderberry_exhaustion2",
   "fields": {
     "name": "Exhaustion2",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/exhaustion2.svg",
     "alt_text": "An icon representing the Exhaustion (two levels) condition. A simple black-and-white diagram of a standing figure hunched over in exhaustion with a large numeral '2'.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -64,7 +64,7 @@
   "pk": "elderberry_exhaustion3",
   "fields": {
     "name": "Exhaustion3",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/exhaustion3.svg",
     "alt_text": "An icon representing the Exhaustion (three levels) condition. A simple black-and-white diagram of a standing figure hunched over in exhaustion with a large numeral '3'.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -76,7 +76,7 @@
   "pk": "elderberry_exhaustion4",
   "fields": {
     "name": "Exhaustion4",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/exhaustion4.svg",
     "alt_text": "An icon representing the Exhaustion (four levels) condition. A simple black-and-white diagram of a standing figure hunched over in exhaustion with a large numeral '4'.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -88,7 +88,7 @@
   "pk": "elderberry_exhaustion5",
   "fields": {
     "name": "Exhaustion5",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/exhaustion5.svg",
     "alt_text": "An icon representing the Exhaustion (five levels) condition. A simple black-and-white diagram of a standing figure hunched over in exhaustion with a large numeral '5'.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -100,7 +100,7 @@
   "pk": "elderberry_exhaustion6",
   "fields": {
     "name": "Exhaustion6",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/exhaustion6.svg",
     "alt_text": "An icon representing the Exhaustion (six levels) condition. A simple black-and-white diagram of a standing figure hunched over in exhaustion with a large numeral '6'.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -112,7 +112,7 @@
   "pk": "elderberry_frightened",
   "fields": {
     "name": "Frightened",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/frightened.svg",
     "alt_text": "An icon representing the Frightened condition. A simple black-and-white silhouette figure from the shoulders up facing the viewer. Their hands are raised to their head and they are screaming.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -124,7 +124,7 @@
   "pk": "elderberry_grappled",
   "fields": {
     "name": "Grappled",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/grappled.svg",
     "alt_text": "An icon representing the Grappled condition. A simple black-and-white image of an arm staining against a chain and shackle attached to the wrist.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -136,7 +136,7 @@
   "pk": "elderberry_incapacitated",
   "fields": {
     "name": "Incapacitated",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/incapacitated.svg",
     "alt_text": "An icon representing the Incapacitated condition. A black-and-white silhouetted figure visible from the shoulders up faces the viewer. There is an X where thier face should be, and a shirling figure over thier head.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -148,7 +148,7 @@
   "pk": "elderberry_inconscious",
   "fields": {
     "name": "Inconscious",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/inconscious.svg",
     "alt_text": "An icon representing the Inconscious condition. A black-and-white silhouetted figure visible from the shoulders up faces the viewer. Where its eyes should be are swirls",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -160,7 +160,7 @@
   "pk": "elderberry_invisible",
   "fields": {
     "name": "Invisible",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/invisible.svg",
     "alt_text": "An icon representing the Invisible condition. A black-and-white silhouette of a figure visible from the shoulders up faces the viewer. They are drawn with a dashed outline to indicate that they are invisible.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -172,7 +172,7 @@
   "pk": "elderberry_paralyzed",
   "fields": {
     "name": "Paralyzed",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/paralyzed.svg",
     "alt_text": "An icon representing the Paralyzed condition. A black-and-white silhouette of a figure visible from the shoulders up faces the viewer. They are surrounded by a chain.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -184,7 +184,7 @@
   "pk": "elderberry_petrified",
   "fields": {
     "name": "Petrified",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/petrified.svg",
     "alt_text": "An icon representing the Petrified condition. A black-and-white silhouette of a figure visible from the shoulders up faces the viewer. They are covered in numerous broad cracks as if they were an old, crumbling statue.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -196,7 +196,7 @@
   "pk": "elderberry_poisoned",
   "fields": {
     "name": "Poisoned",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/poisoned.svg",
     "alt_text": "An icon representing the Poisoned condition. A simple black-and-white drawing of a bottle with a stopper and a skull on its front.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -208,7 +208,7 @@
   "pk": "elderberry_prone",
   "fields": {
     "name": "Prone",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/prone.svg",
     "alt_text": "An icon representing the Prone condition.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -220,7 +220,7 @@
   "pk": "elderberry_restrained",
   "fields": {
     "name": "Restrained",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/restrained.svg",
     "alt_text": "An icon representing the Restrained condition. A simple black-and-white silouetted figure is on all fours, as if crawling. Three large arrows above the figure point downward.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",
@@ -232,7 +232,7 @@
   "pk": "elderberry_stunned",
   "fields": {
     "name": "Stunned",
-    "document": "elderberry",
+    "document": "elderberry-inn-icons",
     "file_path": "/img/object_icons/elderberry-inn-icons/conditions/stunned.svg",
     "alt_text": "An icon representing the Stunned condition. A black-and-white silhouette of a figure visible from the shoulders up faces the viewer. They are surrounded by stars that sit on rings which suggest orbits.",
     "attribution": "Designed with love by Anaislalovi (@anaislalovi) for Elderberry Inn.",