Added pagination to serve different photos

Author: carlosb1

app/mod_photos/controllers.py

@@ -21,7 +21,7 @@ def allowed_file(filename):
 
 
 @mod_photos.route('/photos',methods=['POST'])
-def photos_post():
+def post_photos():
 	app.logger.debug("Applying post photo...")
 
         data = None
@@ -48,7 +48,7 @@ def photos_post():
         return resp
 
 @mod_photos.route('/photos',methods=['GET'])
-def photos_get():
+def get_photos():
 	app.logger.debug("Applying get photos...")
 	photos = Photo.query.all()
 	page = request.args.get('page',1,type=int)
@@ -57,12 +57,13 @@ def photos_get():
         photos = pagination.items
         prev = None
         if pagination.has_prev:
-            prev=url_for('',page=page-1,_external=True)
+            prev=url_for('photos.get_photos',page=page-1,_external=True)
         next = None
         if pagination.has_next:
-            next = url_for('',page=page+1,_external=True)
+            next = url_for('photos.get_photos',page=page+1,_external=True)
 
-	resp = jsonify({'data':
-		[photo.serialize() for photo in photos]})
+	resp = jsonify({'data' :[photo.serialize() for photo in photos],
+            'pagination':{'prev': prev,'next': next,'count':pagination.total}
+            })
 	return resp
 

app/mod_photos/tests.py

@@ -8,6 +8,8 @@
 from factory_responses import FactoryResponse
 from app.data import db
 
+def create_photo(number_users):
+    return [Photo.create(**{'uuid': str(index+1), 'filepath': 'test'+str(index+1)+'.jpg'}) for index in range(0,number_users) ]
 
 class TestModelPhoto(BaseTestCase):
     def test_new_photo(self):
@@ -67,5 +69,24 @@ def test_get_photo_correct(self):
 	with self.app.open_resource("test_resources/photo.jpg") as fp:
             with self.client:
 		response = self.client.get("/photos/v1.0/photos")
+		app.logger.debug(response.json)
 		app.logger.debug(response.json['data'][0]['uuid'])
 
+    
+    def test_get_photo_correct(self):
+	#fake information
+    	create_photo(1)   	
+	#fake data to test get resource
+        with self.client:
+		response = self.client.get("/photos/v1.0/photos")
+		app.logger.debug(response.json)
+		app.logger.debug(response.json['data'][0]['uuid'])
+
+    def test_get_photos_pagination(self):
+	create_photo(102)
+        with self.client:
+		response = self.client.get("/photos/v1.0/photos")
+		app.logger.debug(response.json)
+		app.logger.debug(response.json['data'][0]['uuid'])
+
+