rename tag on name

ramory-l · Jan 4, 2021 · 1c6bf44 · 1c6bf44
1 parent 2aa5f87
commit 1c6bf44
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/backend/src/main/java/ru/school/matcha/converters/TagConverter.java b/backend/src/main/java/ru/school/matcha/converters/TagConverter.java
@@ -17,7 +17,7 @@ private static TagDto convertToDto(Tag source) {
         }
         TagDto result = new TagDto();
         result.setId(source.getId());
-        result.setTag(source.getTag());
+        result.setName(source.getName());
         return result;
     }
 
@@ -27,7 +27,7 @@ private static Tag convertToEntity(TagDto source) {
         }
         Tag result = new Tag();
         result.setId(source.getId());
-        result.setTag(source.getTag());
+        result.setName(source.getName());
         return result;
     }
 

diff --git a/backend/src/main/java/ru/school/matcha/domain/Tag.java b/backend/src/main/java/ru/school/matcha/domain/Tag.java
@@ -10,7 +10,7 @@
 public class Tag {
 
     private Long id;
-    private String tag;
+    private String name;
     private Date createTs;
 
 }
diff --git a/backend/src/main/java/ru/school/matcha/dto/TagDto.java b/backend/src/main/java/ru/school/matcha/dto/TagDto.java
@@ -8,6 +8,6 @@
 public class TagDto {
 
     private Long id;
-    private String tag;
+    private String name;
 
 }
diff --git a/backend/src/main/java/ru/school/matcha/services/TagServiceImpl.java b/backend/src/main/java/ru/school/matcha/services/TagServiceImpl.java
@@ -50,7 +50,7 @@ public void createUserRefTag(String tagName, Long userId) {
             Tag tag;
             if (!tagOptional.isPresent()) {
                 tag = new Tag();
-                tag.setTag(tagName);
+                tag.setName(tagName);
                 createTag(tag);
             } else {
                 tag = tagOptional.get();

diff --git a/backend/src/main/resources/ru/school/matcha/dao/TagMapper.xml b/backend/src/main/resources/ru/school/matcha/dao/TagMapper.xml
@@ -3,13 +3,13 @@
 
     <resultMap id="Tag" type="ru.school.matcha.domain.Tag">
         <id property="id" column="id"/>
-        <result property="tag" column="tag"/>
+        <result property="name" column="tag"/>
         <result property="createTs" column="create_ts"/>
     </resultMap>
 
     <insert id="createTag" keyProperty="id" useGeneratedKeys="true" keyColumn="id">
         INSERT INTO tags(tag)
-        VALUES (#{tag})
+        VALUES (#{name})
     </insert>
 
     <insert id="createUserRefTag">