FIx warning: Redundant String Enum Value Violation: String enum values can be omitted when they are equal to the enumcase name. (redundant_string_enum_value)

Swift/Class.swift.twig

@@ -1,4 +1,4 @@
-{%- import 'swift-utils.twig' as utils -%}
+{%- import 'utils.twig' as utils -%}
 
 {%- set className = utils.formatClassType(type.baseTypeName, type.typeParameters) -%}
 {%- set parentClassName = utils.formatClassType(utils.parentClassType(parent), type.parentTypeParameters) -%}
@@ -8,12 +8,12 @@ import ObjectMapper
 /// {{ description }}
 {% if (not hasChilds) -%}final {% endif %}class {{ className }}: {{ parentClassName }} {
 
-    {% include 'Class.fields.swig' with { fields: fields } %}
-    {% include 'Class.date-transformers.swig' with { fields: fields } %}
+    {% include 'blocks/class/fields.twig' with { fields: fields } %}
+    {% include 'blocks/class/date-transformers.twig' with { fields: fields } %}
     // MARK: - Initializer
 
     required init(map: Map) throws {
-        {%- include 'Class.fields-mapping.swig' with { fields: fields } -%}
+        {%- include 'blocks/class/fields-mapping.twig' with { fields: fields } -%}
         {% if parent is not null %}
         try super.init(map: map)
         {%- endif %}

Swift/Enum.swift.twig

@@ -1,4 +1,4 @@
-{%- import 'swift-utils.twig' as utils -%}
+{%- import 'utils.twig' as utils -%}
 
 import Foundation
 
@@ -8,12 +8,6 @@ import Foundation
 /// - {{ utils.decapitalize(value.name) }}: {{ value.description }}
 {% endfor -%}
 enum {{ name }}: {{ utils.enumType(valuesTypes) }} {
+    {% include 'blocks/enum/cases.twig' with { values: values } %}
 
-    {% for value in values -%}
-        case {{ utils.decapitalize(value.name) }} = {% if valuesTypes == "STRING" -%}
-        "{{ value.value }}"
-    {% else %}
-        {{- value.value }}
-    {% endif -%}
-    {% endfor %}
 }

Swift/blocks/class/date-transformers.twig

@@ -1,4 +1,4 @@
-{%- import 'swift-utils.twig' as utils -%}
+{%- import '../../utils.twig' as utils -%}
 
 {%- set hasDateFields = false -%}
 

Swift/blocks/class/fields-mapping.twig

@@ -1,4 +1,4 @@
-{%- import 'swift-utils.twig' as utils -%}
+{%- import '../../utils.twig' as utils -%}
         {%- for field in fields %}
         {{ field.name }} = {{ utils.formatNullable('try', field.nullable) }} {{ utils.mappingForField(field, className) }}
 {%- endfor -%}

Swift/blocks/class/fields.twig

@@ -1,4 +1,4 @@
-{%- import 'swift-utils.twig' as utils -%}
+{%- import '../../utils.twig' as utils -%}
 
 {%- if fields is not empty -%}
 // MARK: - Fields

Swift/blocks/enum/cases.twig

@@ -0,0 +1,12 @@
+{%- import '../../utils.twig' as utils -%}
+{%- for value in values -%}
+    {%- if valuesTypes == "STRING" %}
+{%- if value.name != value.value %}
+   case {{ utils.decapitalize(value.name) }} = "{{ value.value }}"
+{%- else %}
+    case {{ utils.decapitalize(value.name) -}}
+{% endif -%}
+{%- else %}
+    case {{ utils.decapitalize(value.name) }} = {{ value.value }}
+{%- endif -%}
+{%- endfor -%}