Fix blazor generation and sample

Author: nicolas63

.blueprint/generate-sample/generator.mjs

@@ -60,18 +60,18 @@ export default class extends BaseGenerator {
         }
       },
       async jdlEntities() {
-        if (this.withEntities) {          
+        if (this.withEntities) {
           if (this.sampleName.includes('-mongo-')) {
             this.jdlSample = 'app_mongo';
           } else if (this.sampleName.includes('-react-')) {
             this.jdlSample = 'app-react';
           } else {
             this.jdlSample = 'app';
           }
-          if (this.sampleName.includes('oauth-')) {
-            this.jdlSample = this.jdlSample+'_oauth';
+          if (this.sampleName.includes('jwt-')) {
+            this.jdlSample = this.jdlSample + '_withUserRelation';
           }
-          this.jdlSample = this.jdlSample+'.jdl';
+          this.jdlSample = this.jdlSample + '.jdl';
           this.copyTemplate(`samples/jdl-default/${this.jdlSample}`, this.jdlSample, { noGlob: true });
         }
       },

.blueprint/generate-sample/templates/samples/jdl-default/app-react.jdl

@@ -60,10 +60,6 @@ enum Language {
     FRENCH, ENGLISH, SPANISH
 }
 
-relationship OneToOne {
-	Employee{internalUser} to User with builtInEntity
-}
-
 relationship OneToOne {
 	Country{region} to Region
 }

.blueprint/generate-sample/templates/samples/jdl-default/app-react_oauth.jdl renamed to .blueprint/generate-sample/templates/samples/jdl-default/app-react_withUserRelation.jdl

@@ -60,6 +60,10 @@ enum Language {
     FRENCH, ENGLISH, SPANISH
 }
 
+relationship OneToOne {
+	Employee{internalUser} to User with builtInEntity
+}
+
 relationship OneToOne {
 	Country{region} to Region
 }

.blueprint/generate-sample/templates/samples/jdl-default/app.jdl

@@ -86,10 +86,6 @@ relationship OneToOne {
 	Department{location} to Location
 }
 
-relationship OneToOne {
-	Employee{internalUser} to User with builtInEntity
-}
-
 // defining multiple OneToMany relationships with comments
 relationship OneToMany {
 	Employee to Job{employee},

.blueprint/generate-sample/templates/samples/jdl-default/app_mongo.jdl

@@ -60,10 +60,6 @@ enum Language {
     FRENCH, ENGLISH, SPANISH
 }
 
-relationship OneToOne {
-	Employee{internalUser} to User with builtInEntity
-}
-
 relationship OneToOne {
 	Country{region} to Region
 }

.blueprint/generate-sample/templates/samples/jdl-default/app_mongo_oauth.jdl renamed to .blueprint/generate-sample/templates/samples/jdl-default/app_mongo_withUserRelation.jdl

@@ -60,6 +60,10 @@ enum Language {
     FRENCH, ENGLISH, SPANISH
 }
 
+relationship OneToOne {
+	Employee{internalUser} to User with builtInEntity
+}
+
 relationship OneToOne {
 	Country{region} to Region
 }

.blueprint/generate-sample/templates/samples/jdl-default/app_oauth.jdl renamed to .blueprint/generate-sample/templates/samples/jdl-default/app_withUserRelation.jdl

@@ -86,6 +86,10 @@ relationship OneToOne {
 	Department{location} to Location
 }
 
+relationship OneToOne {
+	Employee{internalUser} to User with builtInEntity
+}
+
 // defining multiple OneToMany relationships with comments
 relationship OneToMany {
 	Employee to Job{employee},

generators/blazor/templates/src/client/Project.Client/Models/_dotnetEntityModel_.cs.ejs

@@ -65,15 +65,15 @@ public class <%= asModel(entityClassName) %> : BaseModel<<%= primaryKeyType %>>
         const relationshipFieldNamePascalized = relationships[idx].relationshipFieldNamePascalized;
         if (relationshipType === 'one-to-one') { _%>
     public <%= getPrimaryKeyType(relationships[idx].otherEntity) %> <%= relationshipFieldNamePascalized %>Id { get; set; }
-            <%_ }
+        <%_ }
         if(relationshipType === 'one-to-many') { _%>
     public IList<<%= asModel(otherEntityNamePascalized) %>> <%= relationshipFieldNamePascalizedPlural %> { get; set; } = new List<<%= asModel(otherEntityNamePascalized) %>>();
         <%_  } else if (relationshipType === 'many-to-one') {
             if (relationshipRequired) { _%>
     [Required]
+        <%_ } _%>
     public <%= getPrimaryKeyType(relationships[idx].otherEntity) %> <%= relationshipFieldNamePascalized %>Id { get; set; }
-            <%_ }
-            } else if (relationshipType === 'many-to-many') { _%>
+        <%_ } else if (relationshipType === 'many-to-many') { _%>
     public IList<<%= asModel(otherEntityNamePascalized) %>> <%= relationshipFieldNamePascalizedPlural %> { get; set; } = new List<<%= asModel(otherEntityNamePascalized) %>>();
         <%_ } _%>