nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

API: Return 409 when trying to create something existing and 410 when trying to delete something already gone

Browse source 
Probably missed a few more cases where we always return sucess when the user requests
status quo, but this should cover most ground
This commit is contained in:
Jonne Haß 2020-01-30 00:01:05 +01:00
parent e8b9a70fbf
commit 04744b4dac
11 changed files with 60 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/v1/likes_controller.rb
View file

@ -36,7 +36,7 @@ module Api
like_service.create(params[:post_id])
rescue ActiveRecord::RecordInvalid => e
if e.message == "Validation failed: Target has already been taken"
return render_error 422, I18n.t("api.endpoint_errors.likes.like_exists")
return render_error 409, I18n.t("api.endpoint_errors.likes.like_exists")
end
raise
@ -52,7 +52,7 @@ module Api
if success
head :no_content
else
render_error 404, I18n.t("api.endpoint_errors.likes.no_like")
render_error 410, I18n.t("api.endpoint_errors.likes.no_like")
end
end

6
app/controllers/api/v1/post_interactions_controller.rb
View file

@ -15,6 +15,8 @@ module Api
def subscribe
post = find_post
return head :conflict if current_user.participations.find_by(target_id: post.id)
current_user.participate!(post)
head :no_content
rescue ActiveRecord::RecordInvalid
@ -29,7 +31,9 @@ module Api
def mute
post = find_post
participation = current_user.participations.find_by!(target_id: post.id)
participation = current_user.participations.find_by(target_id: post.id)
return head :gone unless participation
participation.destroy
head :no_content
end

4
app/controllers/api/v1/reshares_controller.rb
View file

@ -34,7 +34,9 @@ module Api
def create
reshare = reshare_service.create(params.require(:post_id))
rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid, RuntimeError
rescue ActiveRecord::RecordInvalid
render_error 409, I18n.t("reshares.create.error")
rescue ActiveRecord::RecordNotFound, RuntimeError
render_error 422, I18n.t("reshares.create.error")
else
render json: PostPresenter.new(reshare, current_user).as_api_response

4
app/controllers/api/v1/tag_followings_controller.rb
View file

@ -18,6 +18,8 @@ module Api
def create
tag_followings_service.create(params.require(:name))
head :no_content
rescue TagFollowingService::DuplicateTag
render_error 409, I18n.t("api.endpoint_errors.tags.cant_process")
rescue StandardError
render_error 422, I18n.t("api.endpoint_errors.tags.cant_process")
end
@ -25,6 +27,8 @@ module Api
def destroy
tag_followings_service.destroy_by_name(params.require(:id))
head :no_content
rescue ActiveRecord::RecordNotFound
render_error 410, I18n.t("api.endpoint_errors.tags.cant_process")
end
private

18
app/controllers/tag_followings_controller.rb
View file

@ -16,6 +16,8 @@ class TagFollowingsController < ApplicationController
def create
tag = tag_followings_service.create(params["name"])
render json: tag.to_json, status: :created
rescue TagFollowingService::DuplicateTag
render json: tag_followings_service.find(params["name"]), status: created
rescue StandardError
head :forbidden
end
@ -23,16 +25,14 @@ class TagFollowingsController < ApplicationController
# DELETE /tag_followings/1
# DELETE /tag_followings/1.xml
def destroy
success = tag_followings_service.destroy(params["id"])
tag_followings_service.destroy(params["id"])
if success
respond_to do |format|
format.any(:js, :json) { head :no_content }
end
else
respond_to do |format|
format.any(:js, :json) { head :forbidden }
end
respond_to do |format|
format.any(:js, :json) { head :no_content }
end
rescue ActiveRecord::RecordNotFound
respond_to do |format|
format.any(:js, :json) { head :forbidden }
end
end

17
app/services/tag_following_service.rb
View file

@ -10,24 +10,33 @@ class TagFollowingService
raise ArgumentError, "Name field null or empty" if name_normalized.blank?
tag = ActsAsTaggableOn::Tag.find_or_create_by(name: name_normalized)
raise DuplicateTag if @user.tag_followings.exists?(tag_id: tag.id)
tag_following = @user.tag_followings.new(tag_id: tag.id)
raise "Can't process tag entity" unless tag_following.save
tag
end
def find(name)
name_normalized = ActsAsTaggableOn::Tag.normalize(name)
ActsAsTaggableOn::Tag.find_or_create_by(name: name_normalized)
end
def destroy(id)
tag_following = @user.tag_followings.find_by(tag_id: id)
tag_following&.destroy
tag_following = @user.tag_followings.find_by!(tag_id: id)
tag_following.destroy
end
def destroy_by_name(name)
name_normalized = ActsAsTaggableOn::Tag.normalize(name)
followed_tag = @user.followed_tags.find_by(name: name_normalized)
destroy(followed_tag.id) if followed_tag
followed_tag = @user.followed_tags.find_by!(name: name_normalized)
destroy(followed_tag.id)
end
def index
@user.followed_tags
end
class DuplicateTag < RuntimeError; end
end

4
spec/integration/api/likes_controller_spec.rb
View file

@ -134,7 +134,7 @@ describe Api::V1::LikesController do
api_v1_post_likes_path(post_id: @status.guid),
params: {access_token: access_token}
)
confirm_api_error(response, 422, I18n.t("api.endpoint_errors.likes.like_exists"))
confirm_api_error(response, 409, I18n.t("api.endpoint_errors.likes.like_exists"))
likes = like_service.find_for_post(@status.guid)
expect(likes.length).to eq(1)
@ -206,7 +206,7 @@ describe Api::V1::LikesController do
api_v1_post_likes_path(post_id: @status.guid),
params: {access_token: access_token}
)
confirm_api_error(response, 404, I18n.t("api.endpoint_errors.likes.no_like"))
confirm_api_error(response, 410, I18n.t("api.endpoint_errors.likes.no_like"))
likes = like_service.find_for_post(@status.guid)
expect(likes.length).to eq(0)

4
spec/integration/api/post_interactions_controller_spec.rb
View file

@ -72,7 +72,7 @@ describe Api::V1::PostInteractionsController do
access_token: access_token
}
)
expect(response.status).to eq(422)
expect(response.status).to eq(409)
end
it "with improper guid" do
@ -225,7 +225,7 @@ describe Api::V1::PostInteractionsController do
access_token: access_token
}
)
expect(response.status).to eq(404)
expect(response.status).to eq(410)
end
it "with insufficient token" do

2
spec/integration/api/reshares_controller_spec.rb
View file

@ -137,7 +137,7 @@ describe Api::V1::ResharesController do
params: {access_token: access_token}
)
confirm_api_error(response, 422, I18n.t("reshares.create.error"))
confirm_api_error(response, 409, I18n.t("reshares.create.error"))
end
end

4
spec/integration/api/tag_followings_controller_spec.rb
View file

@ -67,7 +67,7 @@ describe Api::V1::TagFollowingsController do
params: {name: "tag3", access_token: access_token}
)
confirm_api_error(response, 422, I18n.t("api.endpoint_errors.tags.cant_process"))
confirm_api_error(response, 409, I18n.t("api.endpoint_errors.tags.cant_process"))
end
end
@ -150,7 +150,7 @@ describe Api::V1::TagFollowingsController do
api_v1_tag_following_path(SecureRandom.uuid.to_s),
params: {access_token: access_token}
)
expect(response.status).to eq(204)
confirm_api_error(response, 410, I18n.t("api.endpoint_errors.tags.cant_process"))
get(
api_v1_tag_followings_path,

20
spec/services/tag_following_service_spec.rb
View file

@ -23,6 +23,14 @@ describe TagFollowingService do
expect { tag_following_service(alice).create("#") }.to raise_error(ArgumentError)
expect { tag_following_service(alice).create(" ") }.to raise_error(ArgumentError)
end
it "throws an error when trying to follow an already followed tag" do
name = SecureRandom.uuid
tag_following_service.create(name)
expect {
tag_following_service.create(name)
}.to raise_error TagFollowingService::DuplicateTag
end
end
describe "#destroy" do
@ -44,14 +52,20 @@ describe TagFollowingService do
it "Does nothing with tag that isn't already followed" do
original_length = alice.followed_tags.length
tag_following_service(alice).destroy_by_name(SecureRandom.uuid)
tag_following_service(alice).destroy(-1)
expect {
tag_following_service(alice).destroy_by_name(SecureRandom.uuid)
}.to raise_error ActiveRecord::RecordNotFound
expect {
tag_following_service(alice).destroy(-1)
}.to raise_error ActiveRecord::RecordNotFound
expect(alice.followed_tags.length).to eq(original_length)
end
it "Does nothing with empty tag name" do
original_length = alice.followed_tags.length
tag_following_service(alice).destroy_by_name("")
expect {
tag_following_service(alice).destroy_by_name("")
}.to raise_error ActiveRecord::RecordNotFound
expect(alice.followed_tags.length).to eq(original_length)
end
end