优化api

Author: dch1228

.idea/MicroBlog.iml

@@ -3,17 +3,52 @@
 from main.models import UserProfile, Follows, Post, Comment
 
 
-class UserSerializer(serializers.ModelSerializer):
-	username = serializers.CharField(source='user.username')
+class PostSerializer(serializers.HyperlinkedModelSerializer):
+	author = serializers.HyperlinkedRelatedField(
+		view_name='userprofile-detail',
+		read_only=True,
+	)
+	comments = serializers.HyperlinkedRelatedField(
+		view_name='comment-detail',
+		read_only=True,
+		many=True,
+	)
+	comment_count = serializers.IntegerField(
+		source='comments.count',
+		read_only=True,
+	)
 
 	class Meta:
-		model = UserProfile
-		fields = ('url', 'username')
+		model = Post
+		fields = ('url', 'body', 'timestamp', 'author', 'comments', 'comment_count')
 
 
-class PostSerializer(serializers.ModelSerializer):
-	author = serializers.URLField(source='author.username')
+class CommentSerializer(serializers.HyperlinkedModelSerializer):
+	post = serializers.HyperlinkedRelatedField(
+		view_name='post-detail',
+		read_only=True,
+	)
+	author = serializers.HyperlinkedRelatedField(
+		view_name='userprofile-detail',
+		read_only=True,
+	)
 
 	class Meta:
-		model = Post
-		fields = ('url', 'body', 'author', 'timestamp')
+		model = Comment
+		fields = ('url', 'post', 'body', 'timestamp', 'author')
+
+
+class UserSerializer(serializers.HyperlinkedModelSerializer):
+	username = serializers.CharField(
+		source='user.username',
+	)
+	member_since = serializers.CharField(
+		source='user.date_joined',
+	)
+	last_seen = serializers.CharField(
+		source='user.last_login',
+	)
+
+	class Meta:
+		model = UserProfile
+		fields = ('url', 'username', 'member_since', 'last_seen')

.idea/dataSources.ids

@@ -5,6 +5,7 @@
 router = routers.DefaultRouter()
 router.register(r'users', views.UserViewSet)
 router.register(r'posts', views.PostViewSet)
+router.register(r'comments', views.CommentViewSet)
 
 urlpatterns = patterns(
 	'',

.idea/dataSources.xml

@@ -1,7 +1,7 @@
 from django.shortcuts import render
-from main.models import UserProfile, Post
+from main.models import UserProfile, Post, Comment
 from rest_framework import viewsets
-from serializers import UserSerializer, PostSerializer
+from serializers import UserSerializer, PostSerializer, CommentSerializer
 
 
 class UserViewSet(viewsets.ModelViewSet):
@@ -11,4 +11,9 @@ class UserViewSet(viewsets.ModelViewSet):
 
 class PostViewSet(viewsets.ModelViewSet):
 	queryset = Post.objects.all()
-	serializer_class = PostSerializer
+	serializer_class = PostSerializer
+
+
+class CommentViewSet(viewsets.ModelViewSet):
+	queryset = Comment.objects.all()
+	serializer_class = CommentSerializer

.idea/modules.xml

@@ -2,4 +2,6 @@
 from models import UserProfile, Post, Follows, Comment
 
 admin.site.register(UserProfile)
-admin.site.register(Follows)
+admin.site.register(Follows)
+admin.site.register(Post)
+admin.site.register(Comment)

api_1_0/serializers.py

@@ -42,10 +42,10 @@ def followed_posts(self):
 class Post(models.Model):
 	body = models.TextField()
 	timestamp = models.DateTimeField(db_index=True, auto_now_add=True)
-	author = models.ForeignKey(User, related_name='author')
+	author = models.ForeignKey(User, related_name='posts')
 
 	def __unicode__(self):
-		return self.author
+		return self.author.username
 
 
 class Follows(models.Model):
@@ -64,7 +64,7 @@ class Comment(models.Model):
 	body = models.TextField()
 	timestamp = models.DateTimeField(db_index=True, auto_now_add=True)
 	author = models.ForeignKey(User)
-	post = models.ForeignKey(Post)
+	post = models.ForeignKey(Post, related_name='comments')
 
 	def __unicode__(self):
 		return self.author.username

api_1_0/urls.py

@@ -84,10 +84,9 @@ def post(request, postid):
 		messages.success(request, '成功发表评论!')
 		return HttpResponseRedirect('/post/%s' % postid)
 	comments = []
-	commentObj = post.comment_set.order_by('timestamp')
+	commentObj = post.comments.order_by('timestamp')
 	for i in commentObj:
 		comments.append(i)
-	post.comment_set.count()
 	return render_to_response(
 		'post.html',
 		{'post': post, 'comments': comments},

api_1_0/views.py

@@ -5,15 +5,15 @@
 		<li class="post">
 			<div class="post-content">
 				<div class="post-date">{{ post.timestamp|date:"Y-m-d H:i:s" }}</div>
-				<div class="post-author"><a href="/user/{{ post.author_id.username }}">{{ post.author_id.username }}</a></div>
+				<div class="post-author"><a href="/user/{{ post.author.username }}">{{ post.author.username }}</a></div>
 				<div class="post-body">{{ post.body }}</div>
 			</div>
 			<div class="post-footer">
 				<a href="/post/{{ post.id }}" class="label label-default">
 					<span>详情</span>
 				</a>&nbsp;
 				<a href="/post/{{ post.id }}" class="label label-primary">
-					<span>评论({{ post.comment_set.count }})</span>
+					<span>评论({{ post.comments.count }})</span>
 				</a>
 			</div>
 		</li>