fix: fix 204 DELETE issue (#1081)

ninoseki · Apr 18, 2024 · 7c92a1e · 7c92a1e
1 parent 42e22e1
commit 7c92a1e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/lib/mihari/web/endpoints/alerts.rb b/lib/mihari/web/endpoints/alerts.rb
@@ -52,19 +52,17 @@ class Alerts < Grape::API
           end
 
           desc "Delete an alert", {
-            success: {code: 204, model: Entities::Message},
+            success: {code: 204},
             failure: [{code: 404, model: Entities::ErrorMessage}],
             summary: "Delete an alert"
           }
           params do
             requires :id, type: Integer
           end
           delete "/:id" do
-            status 204
-
             id = params["id"].to_i
             result = Services::AlertDestroyer.result(id)
-            return present({message: ""}, with: Entities::Message) if result.success?
+            return if result.success?
 
             case result.failure
             when ActiveRecord::RecordNotFound

diff --git a/lib/mihari/web/endpoints/artifacts.rb b/lib/mihari/web/endpoints/artifacts.rb
@@ -87,7 +87,7 @@ class Artifacts < Grape::API
           end
 
           desc "Delete an artifact", {
-            success: {code: 204, model: Entities::Message},
+            success: {code: 204},
             failure: [{code: 404, model: Entities::ErrorMessage}],
             summary: "Delete an artifact"
           }
@@ -99,7 +99,7 @@ class Artifacts < Grape::API
 
             id = params["id"].to_i
             result = Services::ArtifactDestroyer.result(id)
-            return present({message: ""}, with: Entities::Message) if result.success?
+            return if result.success?
 
             case result.failure
             when ActiveRecord::RecordNotFound

diff --git a/lib/mihari/web/endpoints/configs.rb b/lib/mihari/web/endpoints/configs.rb
@@ -15,12 +15,7 @@ class Configs < Grape::API
           }
           get "/" do
             configs = Services::ConfigSearcher.call
-            present(
-              {
-                results: configs
-              },
-              with: Entities::Configs
-            )
+            present({results: configs}, with: Entities::Configs)
           end
         end
       end

diff --git a/lib/mihari/web/endpoints/rules.rb b/lib/mihari/web/endpoints/rules.rb
@@ -167,7 +167,7 @@ def call(yaml, overwrite: true)
           end
 
           desc "Delete a rule", {
-            success: {code: 204, model: Entities::Message},
+            success: {code: 204},
             failure: [{code: 404, model: Entities::ErrorMessage}],
             summary: "Delete a rule"
           }
@@ -179,7 +179,7 @@ def call(yaml, overwrite: true)
 
             id = params[:id].to_s
             result = Services::RuleDestroyer.result(id)
-            return present({message: "ID:#{id} is deleted"}, with: Entities::Message) if result.success?
+            return if result.success?
 
             case result.failure
             when ActiveRecord::RecordNotFound

diff --git a/lib/mihari/web/endpoints/tags.rb b/lib/mihari/web/endpoints/tags.rb
@@ -32,7 +32,7 @@ class Tags < Grape::API
           end
 
           desc "Delete a tag", {
-            success: {code: 204, model: Entities::Message},
+            success: {code: 204},
             failure: [{code: 404, model: Entities::ErrorMessage}],
             summary: "Delete a tag"
           }
@@ -44,7 +44,7 @@ class Tags < Grape::API
 
             id = params[:id].to_i
             result = Services::TagDestroyer.result(id)
-            return present({message: ""}, with: Entities::Message) if result.success?
+            return if result.success?
 
             case result.failure
             when ActiveRecord::RecordNotFound

diff --git a/spec/web/endpoints/artifacts_spec.rb b/spec/web/endpoints/artifacts_spec.rb
@@ -74,7 +74,7 @@ def app
       expect(last_response.status).to eq(404)
     end
 
-    it "returns 201" do
+    it "returns 204" do
       delete "/api/artifacts/#{artifact_to_delete.id}"
       expect(last_response.status).to eq(204)
     end