From 962d677f93dd106dbfec571a5fbf64232aa48c39 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Fri, 14 Mar 2025 15:40:41 +0400
Subject: [PATCH] #26 -- Fix variables and term spaces

---
 .../java/ru/ulstu/fc/rule/model/Variable.java     |  6 ++++++
 .../ulstu/fc/rule/service/FuzzyTermService.java   |  2 +-
 .../ru/ulstu/fc/rule/service/VariableService.java | 15 +++------------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/ru/ulstu/fc/rule/model/Variable.java b/src/main/java/ru/ulstu/fc/rule/model/Variable.java
index 9970fa7..1e006c5 100644
--- a/src/main/java/ru/ulstu/fc/rule/model/Variable.java
+++ b/src/main/java/ru/ulstu/fc/rule/model/Variable.java
@@ -41,6 +41,12 @@ public class Variable extends BaseEntity {
         this.fuzzyTerms = fuzzyTerms;
     }
 
+    public Variable(VariableForm variableForm) {
+        setId(variableForm.getId());
+        this.name = variableForm.getName();
+        this.input = variableForm.isInput();
+    }
+
     public String getName() {
         return name;
     }
diff --git a/src/main/java/ru/ulstu/fc/rule/service/FuzzyTermService.java b/src/main/java/ru/ulstu/fc/rule/service/FuzzyTermService.java
index 7d9fc1e..28a7594 100644
--- a/src/main/java/ru/ulstu/fc/rule/service/FuzzyTermService.java
+++ b/src/main/java/ru/ulstu/fc/rule/service/FuzzyTermService.java
@@ -39,7 +39,7 @@ public class FuzzyTermService {
         } else {
             term = getById(fuzzyTermForm.getId());
         }
-        term.setDescription(fuzzyTermForm.getDescription());
+        term.setDescription(fuzzyTermForm.getDescription().replaceAll(" ", ""));
         term.setCrispValue(fuzzyTermForm.getCrispValue());
         FuzzyTerm ft = fuzzyTermRepository.save(term);
         if (fuzzyTermForm.getId() == null || fuzzyTermForm.getId() == 0) {
diff --git a/src/main/java/ru/ulstu/fc/rule/service/VariableService.java b/src/main/java/ru/ulstu/fc/rule/service/VariableService.java
index 93e3f94..dc5a357 100644
--- a/src/main/java/ru/ulstu/fc/rule/service/VariableService.java
+++ b/src/main/java/ru/ulstu/fc/rule/service/VariableService.java
@@ -30,16 +30,7 @@ public class VariableService {
     }
 
     public Variable save(VariableForm variableForm) {
-        Variable variable;
-        if (variableForm.getId() == null || variableForm.getId() == 0) {
-            variable = new Variable();
-        } else {
-            variable = getById(variableForm.getId());
-        }
-        variable.setProject(projectService.getById(variableForm.getProjectId()));
-        variable.setName(variableForm.getName());
-        variable.setInput(variableForm.isInput());
-        return variableRepository.save(variable);
+        return save(new Variable(variableForm), variableForm.getProjectId());
     }
 
     public Variable save(Variable variable, Integer projectId) {
@@ -50,9 +41,9 @@ public class VariableService {
             dbVariable = getById(variable.getId());
         }
         dbVariable.setProject(projectService.getById(projectId));
-        dbVariable.setName(variable.getName());
+        dbVariable.setName(variable.getName().replaceAll(" ", ""));
         dbVariable.setInput(variable.isInput());
-        return variableRepository.save(variable);
+        return variableRepository.save(dbVariable);
     }
 
     public void delete(VariableForm ruleForm) {
-- 
2.34.1