mihari 5.7.0 → 5.7.2

data/lib/mihari/web/endpoints/tags.rb

@@ -7,6 +7,15 @@ module Mihari
       # Tag API endpoint
       #
       class Tags < Grape::API
+        class TagDestroyer < Service
+          #
+          # @param [Integer] id
+          #
+          def call(id)
+            Mihari::Models::Tag.find(id).destroy
+          end
+        end
+
         namespace :tags do
           desc "Get tags", {
             is_array: true,
@@ -24,17 +33,11 @@ module Mihari
             summary: "Delete a tag"
           }
           params do
-            requires :name, type: String
+            requires :id, type: Integer
           end
-          delete "/:name" do
-            extend Dry::Monads[:result, :try]
-
-            name = params[:name].to_s
-
-            result = Try do
-              Mihari::Models::Tag.where(name: name).destroy_all
-            end.to_result
-
+          delete "/:id" do
+            id = params[:id].to_i
+            result = TagDestroyer.result(id)
             if result.success?
               status 204
               return present({ message: "" }, with: Entities::Message)
@@ -43,10 +46,9 @@ module Mihari
             failure = result.failure
             case failure
             when ActiveRecord::RecordNotFound
-              error!({ message: "Name:#{name} is not found" }, 404)
-            else
-              raise failure
+              error!({ message: "ID:#{id} is not found" }, 404)
             end
+            raise failure
           end
         end
       end

data/lib/mihari/web/middleware/error_notification_adapter.rb

@@ -7,16 +7,21 @@ module Mihari
       # Error notification adapter for Rack app
       #
       class ErrorNotificationAdapter
-        include Mixins::ErrorNotification
-
         def initialize(app)
           @app = app
         end
 
+        def with_error_notification
+          yield
+        rescue StandardError => e
+          Mihari.logger.error e
+
+          Sentry.capture_exception(e) if Sentry.initialized?
+        end
+
         def call(env)
           with_error_notification do
             status, headers, body = @app.call(env)
-
             [status, headers, body]
           end
         end