From 7ab12d6bbe8bc10b99f322484c9605f546dde681 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Fri, 14 Mar 2025 14:22:06 +0400
Subject: [PATCH] #25 -- Fix controllers

---
 .../rule/controller/FuzzyRuleController.java  |  2 ++
 .../FuzzyRuleParseRestController.java         | 20 -------------------
 .../controller/FuzzyRuleRestController.java   | 11 +++++++++-
 3 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleParseRestController.java

diff --git a/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleController.java b/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleController.java
index e13f1c6..e5f6f10 100644
--- a/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleController.java
+++ b/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleController.java
@@ -1,5 +1,6 @@
 package ru.ulstu.fc.rule.controller;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@ import java.util.List;
 
 @Controller
 @RequestMapping("rule")
+@Hidden
 public class FuzzyRuleController {
     private final FuzzyRuleService fuzzyRuleService;
     private final VariableService variableService;
diff --git a/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleParseRestController.java b/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleParseRestController.java
deleted file mode 100644
index e2518c1..0000000
--- a/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleParseRestController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package ru.ulstu.fc.rule.controller;
-
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import ru.ulstu.fc.rule.service.FuzzyRuleParseService;
-
-@RestController("fuzzyRuleParseRest")
-public class FuzzyRuleParseRestController {
-    private final FuzzyRuleParseService fuzzyRuleParseService;
-
-    public FuzzyRuleParseRestController(FuzzyRuleParseService fuzzyRuleParseService) {
-        this.fuzzyRuleParseService = fuzzyRuleParseService;
-    }
-
-    @PostMapping("parse/{projectId}")
-    public void parseRule(@PathVariable("projectId") Integer projectId, String data) {
-        fuzzyRuleParseService.parseFuzzyRules(data, projectId);
-    }
-}
diff --git a/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleRestController.java b/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleRestController.java
index 158e9ba..5cd2bea 100644
--- a/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleRestController.java
+++ b/src/main/java/ru/ulstu/fc/rule/controller/FuzzyRuleRestController.java
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 import ru.ulstu.fc.project.service.ProjectRulesService;
 import ru.ulstu.fc.rule.model.FuzzyRule;
 import ru.ulstu.fc.rule.model.FuzzyRuleForm;
+import ru.ulstu.fc.rule.service.FuzzyRuleParseService;
 import ru.ulstu.fc.rule.service.FuzzyRuleService;
 
 import java.util.List;
@@ -19,11 +20,14 @@ import java.util.List;
 public class FuzzyRuleRestController {
     private final FuzzyRuleService ruleService;
     private final ProjectRulesService projectRulesService;
+    private final FuzzyRuleParseService fuzzyRuleParseService;
 
     public FuzzyRuleRestController(FuzzyRuleService ruleService,
-                                   ProjectRulesService projectRulesService) {
+                                   ProjectRulesService projectRulesService,
+                                   FuzzyRuleParseService fuzzyRuleParseService) {
         this.ruleService = ruleService;
         this.projectRulesService = projectRulesService;
+        this.fuzzyRuleParseService = fuzzyRuleParseService;
     }
 
     @GetMapping("/getAll/{projectId}")
@@ -49,4 +53,9 @@ public class FuzzyRuleRestController {
             ruleService.delete(fuzzyRuleForm);
         }
     }
+
+    @PostMapping("parse/{projectId}")
+    public void parseRule(@PathVariable("projectId") Integer projectId, String data) {
+        fuzzyRuleParseService.parseFuzzyRules(data, projectId);
+    }
 }