Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion spec/controllers/asset_types_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@ module PlaceOS::Api
Spec.test_404(AssetTypes.base_route, model_name: Model::AssetType.table_name, headers: Spec::Authentication.headers, clz: Int64)

describe "index", tags: "search" do
it "should return json when get request is invoked" do
it "should return 404 when no matching asset types found" do
PlaceOS::Model::Asset.clear
PlaceOS::Model::AssetType.clear
params = HTTP::Params.encode({"zone_id" => "unknown-zone"})
path = "#{AssetTypes.base_route}?#{params}"
result = client.get(path, headers: Spec::Authentication.headers)
result.status_code.should eq(404)
end

it "should return json when get request is invoked for matching asset-types" do
PlaceOS::Model::Asset.clear
PlaceOS::Model::AssetType.clear
asset = PlaceOS::Model::Generator.asset.save!
Expand Down
3 changes: 2 additions & 1 deletion src/placeos-rest-api/controllers/asset_types.cr
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,9 @@ module PlaceOS::Api
SQL

result = PgORM::Database.connection do |db|
db.query_one sql, &.read(JSON::PullParser).read_raw
db.query_one sql, &.read(JSON::PullParser?).try &.read_raw
end
raise Error::NotFound.new unless result
render json: result
end

Expand Down
Loading