优化表结构和post视图代码

Author: dch1228

.idea/dataSources.ids

@@ -28,24 +28,16 @@ def is_following(self, user):
 		return bool(self.followers.filter(followed_id=user.id))
 
 	def followed_posts(self):
-		l1 = []
-		l2 = []
-		f = self.followers.all()
-		for i in f:
-			l1.append(i.followed.id)
-		posts = Post.objects.filter(author__in=l1).order_by('-timestamp')
-		for i in posts:
-			l2.append(i)
-		return l2
+		return Post.objects.select_related().filter(author=self.followers.all()).order_by('-timestamp')
 
 
 class Post(models.Model):
 	body = models.TextField()
 	timestamp = models.DateTimeField(db_index=True, auto_now_add=True)
-	author = models.ForeignKey(User, related_name='posts')
+	author = models.ForeignKey(UserProfile, related_name='posts')
 
 	def __unicode__(self):
-		return self.author.username
+		return self.author.user.username
 
 
 class Follows(models.Model):
@@ -54,7 +46,7 @@ class Follows(models.Model):
 	timestamp = models.DateTimeField(auto_now=True)
 
 	def __unicode__(self):
-		return self.follower.user.username
+		return self.followed.user.username
 
 	class Meta:
 		unique_together = (("follower", "followed"),)
@@ -63,7 +55,7 @@ class Meta:
 class Comment(models.Model):
 	body = models.TextField()
 	timestamp = models.DateTimeField(db_index=True, auto_now_add=True)
-	author = models.ForeignKey(User)
+	author = models.ForeignKey(UserProfile, related_name='comments')
 	post = models.ForeignKey(Post, related_name='comments')
 
 	def __unicode__(self):

.idea/dataSources.xml

@@ -17,24 +17,17 @@ def index(request):
 		p.body = body
 		p.save()
 		return HttpResponseRedirect('/')
-	postsObj = []
-	posts = Post.objects.order_by('-timestamp')
-	for i in posts:
-		postsObj.append(i)
-	show_cookie = False
+	show_followed = False
 	if str(request.user) != 'AnonymousUser':
 		u = UserProfile.objects.get(user__username=request.user)
 		show_cookie = bool(request.COOKIES.get('show_followed', ''))
 		if show_cookie:
 			posts = u.followed_posts()
-	if not show_cookie:
-		posts = []
-		postsObj = Post.objects.order_by('-timestamp')
-		for i in postsObj:
-			posts.append(i)
+		else:
+			posts = Post.objects.order_by('-timestamp')
 	return render_to_response(
 		'index.html',
-		{'posts': posts, 'show_followed': show_cookie},
+		locals(),
 		context_instance=RequestContext(request))
 
 

db.sqlite3

@@ -6,7 +6,7 @@
 		<li class="comment">
 			<div class="comment-content">
 				<div class="comment-date">{{ comment.timestamp|date:"Y-m-d H:i:s" }}</div>
-				<div class="comment-author"><a href="/user/{{ comment.author.username }}">{{ comment.author.username }}</a></div>
+				<div class="comment-author"><a href="/user/{{ comment.author.user.username }}">{{ comment.author.user.username }}</a></div>
 				<div class="comment-body">{{ comment.body }}</div>
 			</div>
 		</li>

main/models.py

@@ -5,7 +5,7 @@
 		<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.username }}">{{ post.author.username }}</a></div>
+				<div class="post-author"><a href="/user/{{ post.author.user.username }}">{{ post.author.user.username }}</a></div>
 				<div class="post-body">{{ post.body }}</div>
 			</div>
 			<div class="post-footer">

main/views.py

@@ -7,7 +7,7 @@
 	<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.user.username }}">{{ post.author.user.username }}</a></div>
 			<div class="post-body">{{ post.body }}</div>
 		</div>
 	</li>