diff --git a/app/__init__.py b/app/__init__.py index bc2d7df795801775a9ace003498248cc19ea3a4e..82687a85d4f7bf8a320febb24bebb832e38ee38b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -26,7 +26,7 @@ def create_app(config): app.register_blueprint(errors_bp) from app.api import bp as api_bp - app.register_blueprint(api_bp, url_prefix='/api') + app.register_blueprint(api_bp, url_prefix='/api/v1.0') if not app.debug and not app.testing: if app.config['LOG_TO_STDOUT']: diff --git a/app/api/users.py b/app/api/users.py index 7eabf0e292c7e90e98305cd4fa49a4825a14a72a..ca9e45d32427c35950ed2dcfd495d2f069913552 100644 --- a/app/api/users.py +++ b/app/api/users.py @@ -10,23 +10,17 @@ def get_users(): page = request.args.get('page', 1, type=int) per_page = min(request.args.get('per_page', 10, type=int), 100) data = User.to_collection_dict(User.query, page, per_page, 'api.get_users') - return jsonify(data) + return jsonify(success=True, data=data, status=200) @bp.route('/user', methods=['POST']) def create_user(): data = request.get_json() or {} if 'name' not in data or 'cell_phone_number' not in data: - return bad_request('must include username, email and password fields') - if User.query.filter_by(name=data['name'], ).first(): - return bad_request('please use a different username') - if User.query.filter_by(email=data['cell_phone_number']).first(): - return bad_request('please use a different email address') + return bad_request('must include name and cell_phone_number fields') + print(data) user = User() user.from_dict(data, new_user=True) - db.session.add(user) - db.session.commit() - response = jsonify(user.to_dict()) - response.status_code = 201 - response.headers['Location'] = url_for('api.get_user', id=user.id) - return response + # db.session.add(user) + # db.session.commit() + return jsonify(success=True, data=None, status=201) diff --git a/app/model/models.py b/app/model/models.py index 87fdf8d24b0ae4e82781b903019544947ce0a9dc..0b531f8cbb2eccaf88bb38f90a2ad6d387841ec9 100644 --- a/app/model/models.py +++ b/app/model/models.py @@ -54,4 +54,4 @@ class Photo(db.Model): user_id = db.Column(db.Integer, db.ForeignKey('t_user.id'), nullable=False) def __repr__(self): - return ''.format(self.body) + return ''.format(self.photo_path)