aboutsummaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorGravatar Hasan-Ahmad <[email protected]>2018-10-13 15:33:15 +0100
committerGravatar Hasan-Ahmad <[email protected]>2018-10-13 15:33:15 +0100
commit833cc690736fc301303299b41e9e874b8e430983 (patch)
tree86d17120a1ccd689d7024333728540150fd89552 /api
parentAdded snake facts api (diff)
fixed ordering
Diffstat (limited to 'api')
-rw-r--r--api/admin.py5
-rw-r--r--api/models.py26
-rw-r--r--api/serializers.py15
-rw-r--r--api/urls.py8
4 files changed, 28 insertions, 26 deletions
diff --git a/api/admin.py b/api/admin.py
index 1d152b9e..7d7cf6fb 100644
--- a/api/admin.py
+++ b/api/admin.py
@@ -3,7 +3,8 @@ from django.contrib import admin
from .models import (
DocumentationLink, Member,
OffTopicChannelName, Role,
- SnakeName, Tag, SnakeFact,
+ SnakeFact, SnakeName,
+ Tag,
)
@@ -11,6 +12,6 @@ admin.site.register(DocumentationLink)
admin.site.register(Member)
admin.site.register(OffTopicChannelName)
admin.site.register(Role)
+admin.site.register(SnakeFact)
admin.site.register(SnakeName)
admin.site.register(Tag)
-admin.site.register(SnakeFact)
diff --git a/api/models.py b/api/models.py
index 32f978d4..c37417eb 100644
--- a/api/models.py
+++ b/api/models.py
@@ -60,6 +60,19 @@ class OffTopicChannelName(ModelReprMixin, models.Model):
return self.name
+class SnakeFact(ModelReprMixin, models.Model):
+ """A snake fact used by the bot's snake cog."""
+
+ fact = models.CharField(
+ primary_key=True,
+ max_length=200,
+ help_text="A fact about snakes."
+ )
+
+ def __str__(self):
+ return f"{self.fact}"
+
+
class SnakeName(ModelReprMixin, models.Model):
"""A snake name used by the bot's snake cog."""
@@ -77,19 +90,6 @@ class SnakeName(ModelReprMixin, models.Model):
return f"{self.name} ({self.scientific})"
-class SnakeFact(ModelReprMixin, models.Model):
- """A snake fact used by the bot's snake cog."""
-
- fact = models.CharField(
- primary_key=True,
- max_length=200,
- help_text="A fact about snakes."
- )
-
- def __str__(self):
- return f"{self.fact}"
-
-
class Role(ModelReprMixin, models.Model):
"""A role on our Discord server."""
diff --git a/api/serializers.py b/api/serializers.py
index 900fa8b8..a4482c30 100644
--- a/api/serializers.py
+++ b/api/serializers.py
@@ -4,7 +4,8 @@ from rest_framework_bulk import BulkSerializerMixin
from .models import (
DocumentationLink, Member,
OffTopicChannelName, Role,
- SnakeName, Tag, SnakeFact,
+ SnakeFact, SnakeName,
+ Tag,
)
@@ -23,18 +24,18 @@ class OffTopicChannelNameSerializer(ModelSerializer):
return obj.name
-class SnakeNameSerializer(ModelSerializer):
- class Meta:
- model = SnakeName
- fields = ('name', 'scientific')
-
-
class SnakeFactSerializer(ModelSerializer):
class Meta:
model = SnakeFact
fields = ('fact',)
+class SnakeNameSerializer(ModelSerializer):
+ class Meta:
+ model = SnakeName
+ fields = ('name', 'scientific')
+
+
class RoleSerializer(ModelSerializer):
class Meta:
model = Role
diff --git a/api/urls.py b/api/urls.py
index 38508d38..5cc1b346 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -25,6 +25,10 @@ bot_router.register(
MemberViewSet
)
bot_router.register(
+ 'snake-facts',
+ SnakeFactViewSet,
+)
+bot_router.register(
'snake-names',
SnakeNameViewSet,
base_name='snakename'
@@ -33,10 +37,6 @@ bot_router.register(
'tags',
TagViewSet,
)
-bot_router.register(
- 'snake-fact',
- SnakeFactViewSet,
-)
app_name = 'api'
urlpatterns = (