From 616bb3385e9b70c9ff66adafb48d8b8193bd6866 Mon Sep 17 00:00:00 2001
From: BarminaA <alexandrabarmina99@gmail.com>
Date: Fri, 21 Oct 2022 13:07:34 +0400
Subject: [PATCH 1/4] #76-add rule delete function

---
 .../java/ru/ulstu/extractor/core/Route.java   |  1 +
 .../rule/controller/RuleController.java       | 36 +++++++++++++++----
 .../extractor/rule/service/RuleService.java   |  4 +++
 src/main/resources/templates/listRules.html   | 17 ++++++---
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/core/Route.java b/src/main/java/ru/ulstu/extractor/core/Route.java
index 9627848..0ea2caa 100644
--- a/src/main/java/ru/ulstu/extractor/core/Route.java
+++ b/src/main/java/ru/ulstu/extractor/core/Route.java
@@ -18,6 +18,7 @@ public class Route {
     public static final String STATISTIC = "statistic";
     public static final String LIST_RULE = "listRules";
     public static final String ADD_RULE = "addRule";
+    public static final String DELETE_RULE = "deleteRule";
 
     public static String getLIST_INDEXED_REPOSITORIES() {
         return LIST_INDEXED_REPOSITORIES;
diff --git a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
index 7aeeff1..c222808 100644
--- a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
+++ b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
@@ -2,19 +2,16 @@ package ru.ulstu.extractor.rule.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import ru.ulstu.extractor.rule.model.AddRuleForm;
+import ru.ulstu.extractor.rule.repository.RuleRepository;
 import ru.ulstu.extractor.rule.service.AntecedentValueService;
 import ru.ulstu.extractor.rule.service.RuleService;
 import ru.ulstu.extractor.ts.service.TimeSeriesService;
 import springfox.documentation.annotations.ApiIgnore;
 
-import static ru.ulstu.extractor.core.Route.ADD_RULE;
-import static ru.ulstu.extractor.core.Route.LIST_RULE;
+import static ru.ulstu.extractor.core.Route.*;
 
 @Controller
 @ApiIgnore
@@ -22,13 +19,15 @@ public class RuleController {
     private final RuleService ruleService;
     private final AntecedentValueService antecedentValueService;
     private final TimeSeriesService timeSeriesService;
+    private final RuleRepository ruleRepository;
 
     public RuleController(RuleService ruleService,
                           AntecedentValueService antecedentValueService,
-                          TimeSeriesService timeSeriesService) {
+                          TimeSeriesService timeSeriesService, RuleRepository ruleRepository) {
         this.ruleService = ruleService;
         this.antecedentValueService = antecedentValueService;
         this.timeSeriesService = timeSeriesService;
+        this.ruleRepository = ruleRepository;
     }
 
     @GetMapping(LIST_RULE)
@@ -50,4 +49,27 @@ public class RuleController {
         ruleService.saveRule(ruleForm);
         return "redirect:/" + LIST_RULE;
     }
+
+    @GetMapping(DELETE_RULE)
+    public String deleteRule(Model model,
+                             @RequestParam Integer id) {
+        ruleRepository.deleteById(id);
+        model.addAttribute("rule", ruleRepository.findAll());
+        return "redirect:/" + LIST_RULE;
+    }
+
+//    @RequestMapping(value = FILTER_COMMITS, method = RequestMethod.GET)
+//    public String editRule(Model model,
+//                           @RequestParam Optional<Integer> firstAntecedentValueId,
+//                           @RequestParam Optional<String > firstAntecedentId,
+//                           @RequestParam Optional<Integer> secondAntecedentValueId,
+//                           @RequestParam Optional<String> secondAntecedentId,
+//                           @RequestParam Optional<String> consequent){
+//        AddRuleForm addRuleForm = new AddRuleForm();
+//        addRuleForm.setFirstAntecedentId(firstAntecedentValueId.);
+//        addRuleForm.setFirstAntecedentValueId();
+//        addRuleForm.setSecondAntecedentId();
+//        addRuleForm.setSecondAntecedentValueId();
+//        addRuleForm.setConsequent();
+//    }
 }
diff --git a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
index 63413b9..71fd09a 100644
--- a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
+++ b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
@@ -34,4 +34,8 @@ public class RuleService {
                 TimeSeriesType.valueOf(addRuleForm.getSecondAntecedentId()),
                 addRuleForm.getConsequent()));
     }
+
+    public Rule findById(Integer id) {
+        return ruleRepository.getOne(id);
+    }
 }
diff --git a/src/main/resources/templates/listRules.html b/src/main/resources/templates/listRules.html
index 1f71b46..d6f3ea1 100644
--- a/src/main/resources/templates/listRules.html
+++ b/src/main/resources/templates/listRules.html
@@ -10,7 +10,7 @@
     <table class="table table-striped">
         <thead class="thead-dark">
         <tr>
-            <th scope="col" colspan="8">Правила</th>
+            <th scope="col" colspan="10">Правила</th>
         </tr>
         </thead>
         <tbody>
@@ -23,11 +23,20 @@
             <td><span class="badge badge-success" th:text="${rule.secondAntecedentValue.antecedentValue}"></span></td>
             <td><span class="badge badge-info">то</span></td>
             <td><span class="badge badge-warning" th:text="${rule.consequent}"></span></td>
+            <td>
+                <a role="button" class="btn btn-info" th:href="@{${@route.ADD_RULE} + '?ruleId=' + ${rule.id}}">
+                    <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                </a>
+            </td>
+            <td>
+                <a role="button" class="btn btn-danger" th:href="@{'deleteRule?id=' + ${rule.id}}"
+                   onclick="return confirm('Удалить правило?')">
+                    <i class="fa fa-times" aria-hidden="true"></i>
+                </a>
+            </td>
         </tr>
         </tbody>
     </table>
-    <div class="col-md-4 col-sm-12">
-        <a href="/addRule" class="btn btn-outline-success">Добавить правило</a>
-    </div>
+    <a href="/addRule" class="btn btn-outline-success">Добавить правило</a>
 </div>
 </html>
-- 
2.25.1


From 281d24bde21d22debf06b47572f1569982af0cc8 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Fri, 21 Oct 2022 23:20:48 +0400
Subject: [PATCH 2/4] #76 -- fix edit

---
 .../rule/controller/RuleController.java       | 22 ++++++++++++-----
 .../extractor/rule/model/AddRuleForm.java     |  8 +++++++
 src/main/resources/templates/addRule.html     | 12 +++++-----
 .../java/ru/ulstu/TimeSeriesMapperTest.java   | 24 +++++++++----------
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
index c222808..abd9b8f 100644
--- a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
+++ b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
@@ -2,7 +2,11 @@ package ru.ulstu.extractor.rule.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import ru.ulstu.extractor.rule.model.AddRuleForm;
 import ru.ulstu.extractor.rule.repository.RuleRepository;
@@ -11,7 +15,9 @@ import ru.ulstu.extractor.rule.service.RuleService;
 import ru.ulstu.extractor.ts.service.TimeSeriesService;
 import springfox.documentation.annotations.ApiIgnore;
 
-import static ru.ulstu.extractor.core.Route.*;
+import static ru.ulstu.extractor.core.Route.ADD_RULE;
+import static ru.ulstu.extractor.core.Route.DELETE_RULE;
+import static ru.ulstu.extractor.core.Route.LIST_RULE;
 
 @Controller
 @ApiIgnore
@@ -37,10 +43,15 @@ public class RuleController {
     }
 
     @GetMapping(ADD_RULE)
-    public String getAntecedent(Model model) {
+    public String getAntecedent(Model model, @RequestParam(required = false) Integer ruleId) {
         model.addAttribute("antecedentValues", antecedentValueService.getList());
         model.addAttribute("antecedents", timeSeriesService.getAllTimeSeriesTypes());
-        model.addAttribute("addRuleForm", new AddRuleForm());
+        model.addAttribute("addRuleForm",
+                ruleId != null
+                        ? new AddRuleForm(ruleRepository
+                        .findById(ruleId)
+                        .orElseThrow(() -> new RuntimeException("Правило не найдено")))
+                        : new AddRuleForm());
         return ADD_RULE;
     }
 
@@ -51,8 +62,7 @@ public class RuleController {
     }
 
     @GetMapping(DELETE_RULE)
-    public String deleteRule(Model model,
-                             @RequestParam Integer id) {
+    public String deleteRule(Model model, @RequestParam Integer id) {
         ruleRepository.deleteById(id);
         model.addAttribute("rule", ruleRepository.findAll());
         return "redirect:/" + LIST_RULE;
diff --git a/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java b/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
index 3b64bdd..4878b30 100644
--- a/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
+++ b/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
@@ -10,6 +10,14 @@ public class AddRuleForm {
     public AddRuleForm() {
     }
 
+    public AddRuleForm(Rule rule) {
+        this.firstAntecedentId = rule.getFirstAntecedent().name();
+        this.secondAntecedentId = rule.getSecondAntecedent().name();
+        this.firstAntecedentValueId = rule.getFirstAntecedentValue().getId();
+        this.secondAntecedentValueId = rule.getSecondAntecedentValue().getId();
+        this.consequent = rule.getConsequent();
+    }
+
     public Integer getFirstAntecedentValueId() {
         return firstAntecedentValueId;
     }
diff --git a/src/main/resources/templates/addRule.html b/src/main/resources/templates/addRule.html
index 191e07a..fd5b269 100644
--- a/src/main/resources/templates/addRule.html
+++ b/src/main/resources/templates/addRule.html
@@ -13,7 +13,7 @@
                 Если
             </div>
             <div class="col-md-6 col-sm-12">
-                <select id="select-antecedent" class="selectpicker" data-live-search="true"
+                <select id="select-antecedent" class="selectpicker m-2" data-live-search="true"
                         th:field="*{firstAntecedentId}"
                         data-width="90%">
                     <option th:each="antecedent : ${antecedents}"
@@ -26,7 +26,7 @@
                 имеет тенденцию
             </div>
             <div class="col-md-2 col-sm-12">
-                <select id="select-measures" class="selectpicker" data-live-search="true"
+                <select id="select-measures" class="selectpicker  m-2" data-live-search="true"
                         th:field="*{firstAntecedentValueId}"
                         data-width="100%">
                     <option th:each="antecedentValue : ${antecedentValues}"
@@ -39,7 +39,7 @@
                 и
             </div>
             <div class="col-md-6 col-sm-12">
-                <select id="select-second-antecedent" class="selectpicker" data-live-search="true"
+                <select id="select-second-antecedent" class="selectpicker  m-2" data-live-search="true"
                         th:field="*{secondAntecedentId}"
                         data-width="90%">
                     <option th:each="antecedent : ${antecedents}"
@@ -52,7 +52,7 @@
                 имеет тенденцию
             </div>
             <div class="col-md-2 col-sm-12">
-                <select id="select-second-measures" class="selectpicker" data-live-search="true"
+                <select id="select-second-measures" class="selectpicker m-2" data-live-search="true"
                         th:field="*{secondAntecedentValueId}"
                         data-width="100%">
                     <option th:each="antecedentValue : ${antecedentValues}"
@@ -65,13 +65,13 @@
                 то:
             </div>
             <div class="col-md-6 col-sm-12">
-                <input type="text" class="form-control" th:field="*{consequent}">
+                <input type="text" class="form-control  m-1" th:field="*{consequent}">
             </div>
         </div>
         <div class="row">
             <div class="col-md-4 col-sm-12"></div>
             <div class="col-md-4 col-sm-12">
-                <input type="submit" class="btn btn-outline-success" value="Создать правило"/>
+                <input type="submit" class="btn btn-outline-success  m-2" value="Создать правило"/>
             </div>
         </div>
     </form>
diff --git a/src/test/java/ru/ulstu/TimeSeriesMapperTest.java b/src/test/java/ru/ulstu/TimeSeriesMapperTest.java
index c1cae8d..d799a2b 100644
--- a/src/test/java/ru/ulstu/TimeSeriesMapperTest.java
+++ b/src/test/java/ru/ulstu/TimeSeriesMapperTest.java
@@ -18,8 +18,8 @@ public class TimeSeriesMapperTest {
         Calendar c2 = GregorianCalendar.getInstance();
         c2.set(2020, 5, 2, 2, 1, 1);
         TimeSeries timeSeries = new TimeSeries("Тестовый",
-                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10),
-                        new TimeSeriesValue(c2.getTime(), 10)));
+                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10.0),
+                        new TimeSeriesValue(c2.getTime(), 10.0)));
         TimeSeriesDateMapper mapper = new TimeSeriesDateMapper();
         timeSeries = mapper.mapTimeSeriesToInterval(TimeSeriesDateMapper.TimeSeriesInterval.MONTH, timeSeries);
         Assert.assertEquals(1, timeSeries.getValues().size());
@@ -33,8 +33,8 @@ public class TimeSeriesMapperTest {
         Calendar c2 = GregorianCalendar.getInstance();
         c2.set(2020, 5, 2, 1, 1, 1);
         TimeSeries timeSeries = new TimeSeries("Тестовый",
-                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10),
-                        new TimeSeriesValue(c2.getTime(), 10)));
+                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10.0),
+                        new TimeSeriesValue(c2.getTime(), 10.0)));
         TimeSeriesDateMapper mapper = new TimeSeriesDateMapper();
         timeSeries = mapper.mapTimeSeriesToInterval(TimeSeriesDateMapper.TimeSeriesInterval.MONTH, timeSeries);
         Assert.assertEquals(1, timeSeries.getValues().size());
@@ -48,8 +48,8 @@ public class TimeSeriesMapperTest {
         Calendar c2 = GregorianCalendar.getInstance();
         c2.set(2020, 5, 2, 1, 1, 1);
         TimeSeries timeSeries = new TimeSeries("Тестовый",
-                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10),
-                        new TimeSeriesValue(c2.getTime(), 10)));
+                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10.0),
+                        new TimeSeriesValue(c2.getTime(), 10.0)));
         TimeSeriesDateMapper mapper = new TimeSeriesDateMapper();
         timeSeries = mapper.mapTimeSeriesToInterval(TimeSeriesDateMapper.TimeSeriesInterval.MONTH, timeSeries);
         Assert.assertEquals(1, timeSeries.getValues().size());
@@ -63,8 +63,8 @@ public class TimeSeriesMapperTest {
         Calendar c2 = GregorianCalendar.getInstance();
         c2.set(2020, 6, 2, 1, 1, 1);
         TimeSeries timeSeries = new TimeSeries("Тестовый",
-                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10),
-                        new TimeSeriesValue(c2.getTime(), 10)));
+                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10.0),
+                        new TimeSeriesValue(c2.getTime(), 10.0)));
         TimeSeriesDateMapper mapper = new TimeSeriesDateMapper();
         timeSeries = mapper.mapTimeSeriesToInterval(TimeSeriesDateMapper.TimeSeriesInterval.MONTH, timeSeries);
         Assert.assertEquals(2, timeSeries.getValues().size());
@@ -78,8 +78,8 @@ public class TimeSeriesMapperTest {
         Calendar c2 = GregorianCalendar.getInstance();
         c2.set(2020, 5, 2, 1, 1, 1);
         TimeSeries timeSeries = new TimeSeries("Тестовый",
-                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10),
-                        new TimeSeriesValue(c2.getTime(), 10)));
+                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10.0),
+                        new TimeSeriesValue(c2.getTime(), 10.0)));
         TimeSeriesDateMapper mapper = new TimeSeriesDateMapper();
         timeSeries = mapper.mapTimeSeriesToInterval(TimeSeriesDateMapper.TimeSeriesInterval.YEAR, timeSeries);
         Assert.assertEquals(1, timeSeries.getValues().size());
@@ -93,8 +93,8 @@ public class TimeSeriesMapperTest {
         Calendar c2 = GregorianCalendar.getInstance();
         c2.set(2021, 5, 2, 1, 1, 1);
         TimeSeries timeSeries = new TimeSeries("Тестовый",
-                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10),
-                        new TimeSeriesValue(c2.getTime(), 10)));
+                Arrays.asList(new TimeSeriesValue(c1.getTime(), 10.0),
+                        new TimeSeriesValue(c2.getTime(), 10.0)));
         TimeSeriesDateMapper mapper = new TimeSeriesDateMapper();
         timeSeries = mapper.mapTimeSeriesToInterval(TimeSeriesDateMapper.TimeSeriesInterval.YEAR, timeSeries);
         Assert.assertEquals(2, timeSeries.getValues().size());
-- 
2.25.1


From bf87d34f2002869ee21f7e3b20258a1690ebd984 Mon Sep 17 00:00:00 2001
From: BarminaA <alexandrabarmina99@gmail.com>
Date: Mon, 24 Oct 2022 16:55:43 +0400
Subject: [PATCH 3/4] #76-add edit rule function

---
 .../rule/controller/RuleController.java       | 32 ++-----------------
 .../extractor/rule/model/AddRuleForm.java     | 10 ++++++
 .../extractor/rule/service/RuleService.java   | 28 +++++++++++++---
 src/main/resources/templates/addRule.html     |  6 +++-
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
index abd9b8f..a3bc397 100644
--- a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
+++ b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
@@ -2,11 +2,7 @@ package ru.ulstu.extractor.rule.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import ru.ulstu.extractor.rule.model.AddRuleForm;
 import ru.ulstu.extractor.rule.repository.RuleRepository;
@@ -15,9 +11,7 @@ import ru.ulstu.extractor.rule.service.RuleService;
 import ru.ulstu.extractor.ts.service.TimeSeriesService;
 import springfox.documentation.annotations.ApiIgnore;
 
-import static ru.ulstu.extractor.core.Route.ADD_RULE;
-import static ru.ulstu.extractor.core.Route.DELETE_RULE;
-import static ru.ulstu.extractor.core.Route.LIST_RULE;
+import static ru.ulstu.extractor.core.Route.*;
 
 @Controller
 @ApiIgnore
@@ -46,12 +40,7 @@ public class RuleController {
     public String getAntecedent(Model model, @RequestParam(required = false) Integer ruleId) {
         model.addAttribute("antecedentValues", antecedentValueService.getList());
         model.addAttribute("antecedents", timeSeriesService.getAllTimeSeriesTypes());
-        model.addAttribute("addRuleForm",
-                ruleId != null
-                        ? new AddRuleForm(ruleRepository
-                        .findById(ruleId)
-                        .orElseThrow(() -> new RuntimeException("Правило не найдено")))
-                        : new AddRuleForm());
+        model.addAttribute("addRuleForm", ruleService.getAddRuleFormOrDefault(ruleId));
         return ADD_RULE;
     }
 
@@ -67,19 +56,4 @@ public class RuleController {
         model.addAttribute("rule", ruleRepository.findAll());
         return "redirect:/" + LIST_RULE;
     }
-
-//    @RequestMapping(value = FILTER_COMMITS, method = RequestMethod.GET)
-//    public String editRule(Model model,
-//                           @RequestParam Optional<Integer> firstAntecedentValueId,
-//                           @RequestParam Optional<String > firstAntecedentId,
-//                           @RequestParam Optional<Integer> secondAntecedentValueId,
-//                           @RequestParam Optional<String> secondAntecedentId,
-//                           @RequestParam Optional<String> consequent){
-//        AddRuleForm addRuleForm = new AddRuleForm();
-//        addRuleForm.setFirstAntecedentId(firstAntecedentValueId.);
-//        addRuleForm.setFirstAntecedentValueId();
-//        addRuleForm.setSecondAntecedentId();
-//        addRuleForm.setSecondAntecedentValueId();
-//        addRuleForm.setConsequent();
-//    }
 }
diff --git a/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java b/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
index 4878b30..7834b45 100644
--- a/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
+++ b/src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
@@ -1,6 +1,7 @@
 package ru.ulstu.extractor.rule.model;
 
 public class AddRuleForm {
+    private Integer ruleId;
     private Integer firstAntecedentValueId;
     private String firstAntecedentId;
     private Integer secondAntecedentValueId;
@@ -11,6 +12,7 @@ public class AddRuleForm {
     }
 
     public AddRuleForm(Rule rule) {
+        this.ruleId = rule.getId();
         this.firstAntecedentId = rule.getFirstAntecedent().name();
         this.secondAntecedentId = rule.getSecondAntecedent().name();
         this.firstAntecedentValueId = rule.getFirstAntecedentValue().getId();
@@ -18,6 +20,14 @@ public class AddRuleForm {
         this.consequent = rule.getConsequent();
     }
 
+    public Integer getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Integer ruleId) {
+        this.ruleId = ruleId;
+    }
+
     public Integer getFirstAntecedentValueId() {
         return firstAntecedentValueId;
     }
diff --git a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
index 71fd09a..ae28f8f 100644
--- a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
+++ b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
@@ -28,14 +28,32 @@ public class RuleService {
     }
 
     public void saveRule(AddRuleForm addRuleForm) {
-        ruleRepository.save(new Rule(antecedentValueService.getById(addRuleForm.getFirstAntecedentValueId()),
-                TimeSeriesType.valueOf(addRuleForm.getFirstAntecedentId()),
-                antecedentValueService.getById(addRuleForm.getSecondAntecedentValueId()),
-                TimeSeriesType.valueOf(addRuleForm.getSecondAntecedentId()),
-                addRuleForm.getConsequent()));
+        if (addRuleForm.getRuleId() != null) {
+            Rule rule = ruleRepository.getOne(addRuleForm.getRuleId());
+            rule.setConsequent(addRuleForm.getConsequent());
+            rule.setFirstAntecedent(TimeSeriesType.valueOf(addRuleForm.getFirstAntecedentId()));
+            rule.setFirstAntecedentValue(antecedentValueService.getById(addRuleForm.getFirstAntecedentValueId()));
+            rule.setSecondAntecedent(TimeSeriesType.valueOf(addRuleForm.getSecondAntecedentId()));
+            rule.setSecondAntecedentValue(antecedentValueService.getById(addRuleForm.getSecondAntecedentValueId()));
+            ruleRepository.save(rule);
+        } else {
+            ruleRepository.save(new Rule(antecedentValueService.getById(addRuleForm.getFirstAntecedentValueId()),
+                    TimeSeriesType.valueOf(addRuleForm.getFirstAntecedentId()),
+                    antecedentValueService.getById(addRuleForm.getSecondAntecedentValueId()),
+                    TimeSeriesType.valueOf(addRuleForm.getSecondAntecedentId()),
+                    addRuleForm.getConsequent()));
+        }
     }
 
     public Rule findById(Integer id) {
         return ruleRepository.getOne(id);
     }
+
+    public AddRuleForm getAddRuleFormOrDefault(Integer id) {
+        return id != null
+                ? new AddRuleForm(ruleRepository
+                .findById(id)
+                .orElseThrow(() -> new RuntimeException("Правило не найдено")))
+                : new AddRuleForm();
+    }
 }
diff --git a/src/main/resources/templates/addRule.html b/src/main/resources/templates/addRule.html
index fd5b269..0abb1e8 100644
--- a/src/main/resources/templates/addRule.html
+++ b/src/main/resources/templates/addRule.html
@@ -8,6 +8,7 @@
 </head>
 <div class="container" layout:fragment="content">
     <form action="/listRule" th:action="${@route.ADD_RULE}" th:object="${addRuleForm}" method="post">
+        <input type="hidden" th:field="*{ruleId}">
         <div class="row">
             <div class="col-md-2 col-sm-12">
                 Если
@@ -71,7 +72,10 @@
         <div class="row">
             <div class="col-md-4 col-sm-12"></div>
             <div class="col-md-4 col-sm-12">
-                <input type="submit" class="btn btn-outline-success  m-2" value="Создать правило"/>
+                <input type="submit" class="btn btn-outline-success  m-2" th:if="*{ruleId == null}"
+                       value="Создать правило"/>
+                <input type="submit" class="btn btn-outline-success  m-2" th:if="*{ruleId != null}"
+                       value="Сохранить правило"/>
             </div>
         </div>
     </form>
-- 
2.25.1


From f7338f34c9deafced4143cbb4649a7901b2d68cd Mon Sep 17 00:00:00 2001
From: BarminaA <alexandrabarmina99@gmail.com>
Date: Mon, 24 Oct 2022 17:03:43 +0400
Subject: [PATCH 4/4] #76-fix removing rule

---
 .../rule/controller/RuleController.java        | 18 ++++++++++--------
 .../extractor/rule/service/RuleService.java    |  4 ++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
index a3bc397..7893dea 100644
--- a/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
+++ b/src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
@@ -2,16 +2,21 @@ package ru.ulstu.extractor.rule.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import ru.ulstu.extractor.rule.model.AddRuleForm;
-import ru.ulstu.extractor.rule.repository.RuleRepository;
 import ru.ulstu.extractor.rule.service.AntecedentValueService;
 import ru.ulstu.extractor.rule.service.RuleService;
 import ru.ulstu.extractor.ts.service.TimeSeriesService;
 import springfox.documentation.annotations.ApiIgnore;
 
-import static ru.ulstu.extractor.core.Route.*;
+import static ru.ulstu.extractor.core.Route.ADD_RULE;
+import static ru.ulstu.extractor.core.Route.DELETE_RULE;
+import static ru.ulstu.extractor.core.Route.LIST_RULE;
 
 @Controller
 @ApiIgnore
@@ -19,15 +24,13 @@ public class RuleController {
     private final RuleService ruleService;
     private final AntecedentValueService antecedentValueService;
     private final TimeSeriesService timeSeriesService;
-    private final RuleRepository ruleRepository;
 
     public RuleController(RuleService ruleService,
                           AntecedentValueService antecedentValueService,
-                          TimeSeriesService timeSeriesService, RuleRepository ruleRepository) {
+                          TimeSeriesService timeSeriesService) {
         this.ruleService = ruleService;
         this.antecedentValueService = antecedentValueService;
         this.timeSeriesService = timeSeriesService;
-        this.ruleRepository = ruleRepository;
     }
 
     @GetMapping(LIST_RULE)
@@ -52,8 +55,7 @@ public class RuleController {
 
     @GetMapping(DELETE_RULE)
     public String deleteRule(Model model, @RequestParam Integer id) {
-        ruleRepository.deleteById(id);
-        model.addAttribute("rule", ruleRepository.findAll());
+        ruleService.deleteById(id);
         return "redirect:/" + LIST_RULE;
     }
 }
diff --git a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
index ae28f8f..bb2e2fe 100644
--- a/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
+++ b/src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
@@ -56,4 +56,8 @@ public class RuleService {
                 .orElseThrow(() -> new RuntimeException("Правило не найдено")))
                 : new AddRuleForm();
     }
+
+    public void deleteById(Integer id) {
+        ruleRepository.deleteById(id);
+    }
 }
-- 
2.25.1