Skip to content

Commit a65ce26

Browse files
author
Patryk Bujalla
committed
remove property name change ResultRequired
1 parent bde1643 commit a65ce26

2 files changed

Lines changed: 21 additions & 14 deletions

File tree

PortaCapena.OdooJsonRpcClient/Converters/OdooModelMapper.cs

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static string GetDotNetModel(string tableName, Dictionary<string, OdooPro
115115
var relation = !string.IsNullOrEmpty(property.Value.Relation) ? $"- {property.Value.Relation}{relationField}" : string.Empty;
116116
builder.AppendLine($"/// {property.Key} - {property.Value.Type} {relation} <br />");
117117

118-
builder.AppendLine($"/// Required: {property.Value.Required}, {nameof(property.Value.Readonly)}: {property.Value.Readonly}, {nameof(property.Value.Store)}: {property.Value.Store}, {nameof(property.Value.Sortable)}: {property.Value.Sortable} <br />");
118+
builder.AppendLine($"/// Required: {property.Value.ResultRequired}, {nameof(property.Value.Readonly)}: {property.Value.Readonly}, {nameof(property.Value.Store)}: {property.Value.Store}, {nameof(property.Value.Sortable)}: {property.Value.Sortable} <br />");
119119

120120
if (!string.IsNullOrEmpty(property.Value.Help))
121121
builder.AppendLine($"/// {nameof(property.Value.Help)}: {property.Value.Help.Replace("\n", "; ")} <br />");
@@ -135,8 +135,15 @@ public static string GetDotNetModel(string tableName, Dictionary<string, OdooPro
135135
builder.AppendLine(string.Empty);
136136
builder.AppendLine(string.Empty);
137137

138-
if (!string.IsNullOrEmpty(property.Value.Help))
139-
builder.AppendLine("// " + property.Value.Help.Replace("\n", "\n // "));
138+
if (addSummary)
139+
{
140+
builder.AppendLine($"/// <summary>");
141+
142+
if (!string.IsNullOrEmpty(property.Value.Help))
143+
builder.AppendLine($"/// {nameof(property.Value.Help)}: {property.Value.Help.Replace("\n", " <br />\n /// ")}");
144+
145+
builder.AppendLine($"/// </summary>");
146+
}
140147

141148
builder.AppendLine($"[JsonConverter(typeof(StringEnumConverter))]");
142149
builder.AppendLine($"public enum {ConvertOdooNameToDotNet(property.Value.String)}{ConvertOdooNameToDotNet(tableName)}{OdooEnumSuffix}");
@@ -165,40 +172,40 @@ public static string ConvertToDotNetPropertyTypeName(KeyValuePair<string, OdooPr
165172
case OdooValueTypeEnum.Char:
166173
return "string";
167174
case OdooValueTypeEnum.Selection:
168-
return $"{ConvertOdooNameToDotNet(property.Value.String)}{ConvertOdooNameToDotNet(tableName)}{OdooEnumSuffix}{(property.Value.Required ? "" : "?")}";
175+
return $"{ConvertOdooNameToDotNet(property.Value.String)}{ConvertOdooNameToDotNet(tableName)}{OdooEnumSuffix}{(property.Value.ResultRequired ? "" : "?")}";
169176
case OdooValueTypeEnum.Text:
170177
return "string";
171178
case OdooValueTypeEnum.Html:
172179
return "string";
173180

174181
case OdooValueTypeEnum.Boolean:
175-
return property.Value.Required ? "bool" : "bool?";
182+
return property.Value.ResultRequired ? "bool" : "bool?";
176183

177184
case OdooValueTypeEnum.Monetary:
178-
return property.Value.Required ? "decimal" : "decimal?";
185+
return property.Value.ResultRequired ? "decimal" : "decimal?";
179186

180187
case OdooValueTypeEnum.Float:
181-
return property.Value.Required ? "double" : "double?";
188+
return property.Value.ResultRequired ? "double" : "double?";
182189
case OdooValueTypeEnum.Integer:
183190
if (property.Key.ToString().ToLower() == "id")
184191
return "long";
185-
return property.Value.Required ? "int" : "int?";
192+
return property.Value.ResultRequired ? "int" : "int?";
186193

187194
case OdooValueTypeEnum.Date:
188-
return property.Value.Required ? "DateTime" : "DateTime?";
195+
return property.Value.ResultRequired ? "DateTime" : "DateTime?";
189196
case OdooValueTypeEnum.Datetime:
190-
return property.Value.Required ? "DateTime" : "DateTime?";
197+
return property.Value.ResultRequired ? "DateTime" : "DateTime?";
191198

192199
case OdooValueTypeEnum.Many2One:
193-
return property.Value.Required ? "long" : "long?";
200+
return property.Value.ResultRequired ? "long" : "long?";
194201
case OdooValueTypeEnum.Many2OneReference:
195-
return property.Value.Required ? "long" : "long?";
202+
return property.Value.ResultRequired ? "long" : "long?";
196203
case OdooValueTypeEnum.Many2Many:
197204
return "long[]";
198205
case OdooValueTypeEnum.One2Many:
199206
return "long[]";
200207
case OdooValueTypeEnum.One2One:
201-
return property.Value.Required ? "long" : "long?";
208+
return property.Value.ResultRequired ? "long" : "long?";
202209

203210
case OdooValueTypeEnum.Reference:
204211
return ConvertOdooNameToDotNet(property.Value.RelationField) + OdooModelSuffix;

PortaCapena.OdooJsonRpcClient/Models/OdooPropertyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class OdooPropertyInfo : IOdooAtributtesModel
2929
public bool Readonly { get; set; }
3030

3131
[JsonProperty("required")]
32-
public bool Required { get; set; }
32+
public bool ResultRequired { get; set; }
3333

3434
[JsonProperty("searchable")]
3535
public bool Searchable { get; set; }

0 commit comments

Comments
 (0)