fix format and UT

Author: nicolas63

generators/entity-client/templates/blazor/src/Project.Client/Models/Model.cs.ejs

@@ -67,7 +67,7 @@ namespace <%= namespace %>.Client.Models
                 if(otherEntityNamePascalized === 'User') { _%>
         public string UserId { get; set; }
                 <%_ } else { _%>
-        public <%= primaryKeyType %> <% if(primaryKeyType !== 'string') { _%>?<%_ } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
+        public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>? <% } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
                 <%_ }
             }
             if(relationshipType === 'one-to-many') { _%>
@@ -79,7 +79,7 @@ namespace <%= namespace %>.Client.Models
                 if(otherEntityNamePascalized === 'User') { _%>
         public string UserId { get; set; }
                 <%_ } else { _%>
-        public <%= primaryKeyType %> <% if(primaryKeyType !== 'string') { _%>?<%_ } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
+        public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>? <% } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
                 <%_ }
                 } else if (relationshipType === 'many-to-many') { _%>
         public IList<<%= asModel(otherEntityNamePascalized) %>> <%= relationshipFieldNamePascalizedPlural %> { get; set; } = new List<<%= asModel(otherEntityNamePascalized) %>>();

generators/entity-client/templates/blazor/src/Project.Client/Pages/Entities/Entity/EntityUpdate.razor.cs.ejs

@@ -70,7 +70,7 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
                     <%_ } else { _%>
         public IEnumerable<<%= primaryKeyType %>> <%= relation.otherEntityNamePascalized %>Ids { get; set; } = new List<<%= primaryKeyType %>>();
 
-        public <%= primaryKeyType %> <% if(primaryKeyType !== 'string') { _%>?<%_ } _%> <%= relation.otherEntityNamePascalized %>Id { get; set; }
+        public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>? <% } _%> <%= relation.otherEntityNamePascalized %>Id { get; set; }
 
                     <%_ } _%>
             <%_ } else if ((relation.relationshipType === 'many-to-many' || relation.relationshipType === 'one-to-many') && relation.ownerSide === true ) { _%>

generators/entity-client/templates/blazor/test/Project.Client.Test/Pages/Entities/Entity/EntityDetailTest.cs.ejs

@@ -68,7 +68,7 @@ namespace <%= namespace %>.Client.Test.Pages.Entities.<%= entityClassName %>
             //Arrange
             var <%= lowerCasedEntityClass %> = _fixture.Create<<%= asModel(entityClassName) %>>();
             _<%= lowerCasedEntityClass %>Service.Setup(service => service.Get(It.IsAny<string>())).Returns(Task.FromResult(<%= lowerCasedEntityClass %>));
-            var <%= lowerCasedEntityClass %>Detail = RenderComponent<<%= entityClassName %>Detail>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { %> 1 <%_ } else { _%> "1" <%_ } _%>));
+            var <%= lowerCasedEntityClass %>Detail = RenderComponent<<%= entityClassName %>Detail>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { _%> 1L <%_ } else { _%> "1" <%_ } _%>));
 
             // Act
             var title = <%= lowerCasedEntityClass %>Detail.Find("h2");

generators/entity-client/templates/blazor/test/Project.Client.Test/Pages/Entities/Entity/EntityUpdateTest.cs.ejs

@@ -109,11 +109,11 @@ namespace <%= namespace %>.Client.Test.Pages.Entities.<%= entityClassName %>
             }); _%>
 
             var <%= entityVariableName %>ToUpdate = _fixture.Create<<%= asModel(entityClassName) %>>();
-            <%= entityVariableName %>ToUpdate.Id = <% if(primaryKeyType !== 'string') { %> 1 <%_ } else { _%> "1" <%_ } _%>;
+            <%= entityVariableName %>ToUpdate.Id = <% if(primaryKeyType !== 'string') { _%> 1 <%_ } else { _%> "1" <%_ } _%>;
 
             _<%= entityVariableName %>Service.Setup(service => service.Get(It.IsAny<string>())).Returns(Task.FromResult(<%= entityVariableName %>ToUpdate));
 
-            var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { %> 1 <%_ } else { _%> "1" <%_ } _%>));
+            var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { _%> 1L <%_ } else { _%> "1" <%_ } _%>));
 
             // Act
             var <%= entityVariableName %>Form = update<%= entityClassName %>Page.Find("form");
@@ -137,7 +137,7 @@ namespace <%= namespace %>.Client.Test.Pages.Entities.<%= entityClassName %>
                 <%_ }
             }); _%>
 
-            var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { %> 0 <%_ } else { _%> null <%_ } _%>));
+            var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { _%> 0L <%_ } else { _%> null <%_ } _%>));
 
             // Act
             var <%= entityVariableName %>Form = update<%= entityClassName %>Page.Find("form");

generators/entity-server/templates/dotnetcore/src/Project.Domain/Entities/Entity.cs.ejs

@@ -75,7 +75,7 @@ namespace <%= namespace %>.Domain
                 if(otherEntityNamePascalized === 'User') { _%>
         public string UserId { get; set; }
                 <%_ } else { _%>
-        public <%= primaryKeyType %> <% if(primaryKeyType !== 'string') { _%>?<%_ } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
+        public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>? <% } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
                 <%_ } _%>
         public <%= otherEntityNamePascalized %> <%= relationshipFieldNamePascalized %> { get; set; }
 <%_ }
@@ -88,7 +88,7 @@ namespace <%= namespace %>.Domain
                 if(otherEntityNamePascalized === 'User') { _%>
         public string UserId { get; set; }
                 <%_ } else { _%>
-        public <%= primaryKeyType %> <% if(primaryKeyType !== 'string') { _%>?<%_ } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
+        public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>? <% } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
                 <%_ } _%>
         public <%= otherEntityNamePascalized %> <%= relationshipFieldNamePascalized %> { get; set; }
 <% } else if (relationshipType === 'many-to-many') {

generators/entity-server/templates/dotnetcore/src/Project.Dto/Dto.cs.ejs

@@ -77,7 +77,7 @@ namespace <%= namespace %>.Dto
                 if(otherEntityNamePascalized === 'User') { _%>
         public string UserId { get; set; }
                 <%_ } else { _%>
-        public <%= primaryKeyType %> <% if(primaryKeyType !== 'string') { _%>?<%_ } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
+        public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>? <% } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
                 <%_ }
             }
             if(relationshipType === 'one-to-many') { _%>
@@ -89,7 +89,7 @@ namespace <%= namespace %>.Dto
                 if(otherEntityNamePascalized === 'User') { _%>
         public string UserId { get; set; }
                 <%_ } else { _%>
-        public <%= primaryKeyType %> <% if(primaryKeyType !== 'string') { _%>?<%_ } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
+        public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>? <% } _%> <%= relationshipFieldNamePascalized %>Id { get; set; }
                 <%_ }
                 } else if (relationshipType === 'many-to-many') {
                 const ownerSide = relationships[idx].ownerSide; _%>