fix PKColumn.Name not equal to "Id" bug. Ref #28

Author: Ahoo-Wang

build/version.props

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>2</VersionMajor>
 		<VersionMinor>2</VersionMinor>
-		<VersionPatch>42</VersionPatch>
+		<VersionPatch>44</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>

src/SmartCode.Generator/RazorTemplates/CSharp/API/APIController.cshtml

@@ -44,15 +44,15 @@ namespace @(project.Module).API.Controllers
     Body = @(serviceName).Insert(@entityCamelName)
     };
     }
-    [HttpPost]
-    public ResponseMessageWrap@("<int>") DeleteById([FromBody]@pkType id)
+    [HttpDelete]
+    public ResponseMessageWrap@("<int>") DeleteById(@pkType id)
     {
     return new ResponseMessageWrap@("<int>")
     {
     Body = @(serviceName).DeleteById(id)
     };
     }
-    [HttpPost]
+    [HttpPut]
     public ResponseMessageWrap@("<int>") Update([FromBody]@entityName @entityCamelName)
     {
     return new ResponseMessageWrap@("<int>")
@@ -61,8 +61,8 @@ namespace @(project.Module).API.Controllers
     };
     }
 
-    [HttpPost]
-    public ResponseMessageWrap@($"<{entityName}>") GetById([FromBody]@pkType id)
+    [HttpGet]
+    public ResponseMessageWrap@($"<{entityName}>") GetById(@pkType id)
     {
     var @entityCamelName = @(repositoryName).GetById(id);
     return new ResponseMessageWrap@($"<{entityName}>")

src/SmartCode.Generator/RazorTemplates/CSharp/Proj-API.cshtml

@@ -2,7 +2,7 @@
 @model BuildContext
 @{
     var project = Model.Project;
-    var smartsqlVersion = "4.0.33";
+    var smartsqlVersion = "4.0.42";
     if (project.Parameters.Value("SmartSqlVersion", out string version))
     {
         smartsqlVersion = version;

src/SmartCode.Generator/RazorTemplates/CSharp/Proj-Repository.cshtml

@@ -8,12 +8,12 @@
     var dbProviderAssNames = dbFactory.GetType().Assembly.FullName.Split(',');
     var dbProviderName = dbProviderAssNames[0];
     var dbProviderVersion = dbProviderAssNames[1].Split('=')[1];
-    var smartSqlVersion = "4.0.33";
+    var smartSqlVersion = "4.0.42";
     if (project.Parameters.Value("SmartSqlVersion", out string version))
     {
         smartSqlVersion = version;
     }
-    var smartSqlSchemaVersion = "4.0.26";
+    var smartSqlSchemaVersion = "4.0.42";
     if (project.Parameters.Value("SmartSqlSchemaVersion", out string schemaVersion))
     {
         smartSqlSchemaVersion = schemaVersion;

src/SmartCode.Generator/RazorTemplates/CSharp/Repository.cshtml

@@ -6,22 +6,31 @@
     var project = Model.Project;
     var buildTask = Model.Build;
     var table = Model.GetCurrentTable();
-    var primaryKeyType = table.PKColumn?.LanguageType ?? "int";
+    var pkCol = table.PKColumn;
+    if (pkCol == null)
+    {
+        throw new SmartCodeException($"Repository Template can not find PKColumn,Table:{table.Name}.");
+    }
+    var primaryKeyType = pkCol.LanguageType ?? "int";
     var autoIncrement = table.AutoIncrement;
     var dbSource = Model.GetDataSource<DbSource>();
+
+    var PKNameEQId = pkCol.Name == "Id";
 }
 
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Text;
+using System.Threading.Tasks;
 using SmartSql.DyRepository;
 using SmartSql.DyRepository.Annotations;
 using @(project.Module).Entity;
 
 namespace @(project.Module).@buildTask.Module
 {
-    public interface I@(table.ConvertedName)Repository : IRepository<@(table.ConvertedName), @(primaryKeyType)>
+public interface I@(table.ConvertedName)Repository : IRepository<@(table.ConvertedName), @(primaryKeyType)>
+    ,IRepositoryAsync<@(table.ConvertedName), @(primaryKeyType)>
         {
         @if (dbSource.DbRepository.DbProvider == DbProvider.PostgreSql
 && autoIncrement)
@@ -30,11 +39,43 @@ namespace @(project.Module)[email protected]
             @Html.NewLine()
             @Html.PadLeft(8) <text>new @primaryKeyType Insert(@table.ConvertedName entity);</text>
             @Html.NewLine()
+
+            <text>[Statement(Execute = ExecuteBehavior.QuerySingle)]</text>
+            @Html.NewLine()
+            @Html.PadLeft(8) <text>new Task<@primaryKeyType> InsertAsync(@table.ConvertedName entity);</text>
+            @Html.NewLine()
         }
         else if (autoIncrement && primaryKeyType != "int")
         {
             @Html.PadLeft(8) <text>new @primaryKeyType Insert(@table.ConvertedName entity);</text>
             @Html.NewLine()
+
+            @Html.PadLeft(8) <text>new Task<@primaryKeyType> InsertAsync(@table.ConvertedName entity);</text>
+            @Html.NewLine()
+        }
+
+        @if (!PKNameEQId)
+        {
+            <text>[Statement(Id = "GetEntity")]</text>
+            @Html.NewLine()
+            @Html.PadLeft(8) <text>new @table.ConvertedName GetById([Param("@pkCol.Name")]@primaryKeyType id);</text>
+            @Html.NewLine()
+
+            <text>[Statement(Id = "GetEntity")]</text>
+            @Html.NewLine()
+            @Html.PadLeft(8) <text>new Task<@table.ConvertedName> GetByIdAsync([Param("@pkCol.Name")]@primaryKeyType id);</text>
+            @Html.NewLine()
+
+            <text>[Statement(Id = "Delete")]</text>
+            @Html.NewLine()
+            @Html.PadLeft(8) <text>new int DeleteById([Param("@pkCol.Name")]@primaryKeyType id);</text>
+            @Html.NewLine()
+
+            <text>[Statement(Id = "Delete")]</text>
+            @Html.NewLine()
+            @Html.PadLeft(8) <text>new Task<@("int")> DeleteByIdAsync([Param("@pkCol.Name")]@primaryKeyType id);</text>
+            @Html.NewLine()
+
         }
         }
         }

src/SmartCode.Generator/RazorTemplates/CSharp/Service.cshtml

@@ -4,8 +4,12 @@
     Layout = "_CSharpLayout.cshtml";
     var project = Model.Project;
     var table = Model.GetCurrentTable();
-
-    var pkType = table.PKColumn.LanguageType;
+    var pkCol = table.PKColumn;
+    if (pkCol == null)
+    {
+        throw new SmartCodeException($"Service Template can not find PKColumn,Table:{table.Name}.");
+    }
+    var pkType = pkCol.LanguageType;
     var insertRetType = table.AutoIncrement ? pkType : "int";
     var entityName = table.ConvertedName;
     var entityCamelName = NamingUtil.CamelCase(table.ConvertedName);