Merge pull request AdCombo#51 from samuelfirst/fix_raise_404_ObjectNotFound

fix AdCombo#35 Raise 404 ObjectNotFound when a single resource does not exist

Author: dmitrymishanov

flask_combo_jsonapi/resource.py

@@ -12,7 +12,8 @@
 
 from flask_combo_jsonapi.querystring import QueryStringManager as QSManager
 from flask_combo_jsonapi.pagination import add_pagination_links
-from flask_combo_jsonapi.exceptions import InvalidType, BadRequest, RelationNotFound, PluginMethodNotImplementedError
+from flask_combo_jsonapi.exceptions import InvalidType, BadRequest, RelationNotFound, PluginMethodNotImplementedError,\
+    ObjectNotFound
 from flask_combo_jsonapi.decorators import check_headers, check_method_requirements, jsonapi_exception_formatter
 from flask_combo_jsonapi.schema import compute_schema, get_relationships, get_model_field
 from flask_combo_jsonapi.data_layers.base import BaseDataLayer
@@ -234,6 +235,11 @@ def get(self, *args, **kwargs):
 
         obj = self.get_object(kwargs, qs)
 
+        if obj is None:
+            url_field = getattr(self._data_layer, "url_field", "id")
+            value = f" '{kwargs.get(url_field)}'" if kwargs.get(url_field) else ""
+            raise ObjectNotFound(f"{self.data_layer['model'].__name__}{value} not found.")
+
         self.before_marshmallow(args, kwargs)
 
         schema = compute_schema(self.schema, getattr(self, "get_schema_kwargs", dict()), qs, qs.include)

tests/test_sqlalchemy_data_layer.py

@@ -1217,7 +1217,7 @@ def test_get_list_invalid_sort(client, register_routes):
 def test_get_detail_object_not_found(client, register_routes):
     with client:
         response = client.get("/persons/3", content_type="application/vnd.api+json")
-        assert response.status_code == 200
+        assert response.status_code == 404
 
 
 def test_post_relationship_related_object_not_found(client, register_routes, person):