mihari 4.12.0 → 5.0.1

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

@@ -4,9 +4,19 @@ module Mihari
   module Endpoints
     class Rules < Grape::API
       namespace :rules do
+        desc "Get Rule IDs", {
+          is_array: true,
+          success: Entities::RuleIDs,
+          summary: "Get rule IDs"
+        }
+        get "/ids" do
+          rule_ids = Mihari::Rule.distinct.pluck(:id)
+          present({ rule_ids: rule_ids }, with: Entities::RuleIDs)
+        end
+
         desc "Search rules", {
           is_array: true,
-          success: Entities::Rule,
+          success: Entities::RulesWithPagination,
           failure: [{ code: 404, message: "Not found", model: Entities::Message }],
           summary: "Search rules"
         }
@@ -40,7 +50,13 @@ module Mihari
           rules = Mihari::Rule.search(search_filter_with_pagenation)
           total = Mihari::Rule.count(search_filter_with_pagenation.without_pagination)
 
-          present({ rules: rules.map(&:to_h), total: total, current_page: page, page_size: limit }, with: Entities::RulesWithPagination)
+          present(
+            { rules: rules,
+              total: total,
+              current_page: page,
+              page_size: limit },
+            with: Entities::RulesWithPagination
+          )
         end
 
         desc "Get a rule", {
@@ -60,7 +76,7 @@ module Mihari
             error!({ message: "ID:#{id} is not found" }, 404)
           end
 
-          present rule.to_h, with: Entities::Rule
+          present rule, with: Entities::Rule
         end
 
         desc "Run a rule", {
@@ -74,14 +90,12 @@ module Mihari
           id = params["id"].to_s
 
           begin
-            rule = Mihari::Rule.find(id)
+            rule = Mihari::Structs::Rule.from_model(Mihari::Rule.find(id))
           rescue ActiveRecord::RecordNotFound
             error!({ message: "ID:#{id} is not found" }, 404)
           end
 
-          struct = Mihari::Structs::Rule.from_model(rule)
-          analyzer = struct.to_analyzer
-          analyzer.run
+          rule.analyzer.run
 
           status 201
           present({ message: "ID:#{id} is ran successfully" }, with: Entities::Message)
@@ -121,14 +135,13 @@ module Mihari
           end
 
           begin
-            model = rule.to_model
-            model.save
+            rule.model.save
           rescue ActiveRecord::RecordNotUnique
             error!({ message: "ID:#{rule.id} is already registered" }, 400)
           end
 
           status 201
-          present model.to_h, with: Entities::Rule
+          present rule.model, with: Entities::Rule
         end
 
         desc "Update a rule", {
@@ -150,7 +163,7 @@ module Mihari
           end
 
           begin
-            rule = Structs::Rule.from_yaml(yaml, id: id)
+            rule = Structs::Rule.from_yaml(yaml)
           rescue YAMLSyntaxError => e
             error!({ message: e.message }, 400)
           end
@@ -165,14 +178,13 @@ module Mihari
           end
 
           begin
-            model = rule.to_model
-            model.save
+            rule.model.save
           rescue ActiveRecord::RecordNotUnique
-            error!({ message: "ID:#{model.id} is already registered" }, 400)
+            error!({ message: "ID:#{id} is already registered" }, 400)
           end
 
           status 201
-          present model.to_h, with: Entities::Rule
+          present rule.model, with: Entities::Rule
         end
 
         desc "Delete a rule", {