Fix error in import-jdl and many-to-many

generators/common/templates/dotnetcore/README.md.ejs

@@ -20,7 +20,7 @@
 <%_
 let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL + DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`;
 _%>
-This application was generated using JHipster <%= jhipsterVersion %> and JHipster .Net Core 0.3.0, you can find documentation and help at [<%= DOCUMENTATION_ARCHIVE_URL %>](<%= DOCUMENTATION_ARCHIVE_URL %>).
+This application was generated using JHipster <%= jhipsterVersion %> and JHipster .Net Core 1.0.0-alpha, you can find documentation and help at [<%= DOCUMENTATION_ARCHIVE_URL %>](<%= DOCUMENTATION_ARCHIVE_URL %>).
 
 ## Development
 

generators/entity-server/files.js

@@ -101,6 +101,7 @@ function writeFiles() {
     return {
         writeServerFiles() {
             this.relationships.forEach(relationship => {
+                // const relationship = relationship;
                 if (relationship.relationshipType === 'many-to-many') {
                     joinEntitiesTemplates.push({
                         file: 'Project/Models/JoinEntity.cs',

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

@@ -21,12 +21,12 @@ let joinEntityTableName;
 let joinEntityClassName;
 let ownerSide;
 let idx = 0;
-while (idx < relationships.length && !relationship) {
-    if (relationships[idx].relationshipType == 'many-to-many' && !relationships[idx].joinEntityGenerated) {
-        relationship = relationships[idx];
+while (idx < relationships.length) {
+    relationship = relationships[idx];
+    joinEntityTableName = relationships[idx].joinEntityNameSnakeCased;
+    joinEntityClassName = relationships[idx].joinEntityNamePascalized;
+    if (relationships[idx].relationshipType == 'many-to-many') {
         relationships[idx].joinEntityGenerated = true;
-        joinEntityTableName = relationships[idx].joinEntityNameSnakeCased;
-        joinEntityClassName = relationships[idx].joinEntityNamePascalized;
         ownerSide = relationships[idx].ownerSide;
     }
     idx++;

generators/server/templates/dotnetcore/src/Project/Controllers/AuthController.cs.ejs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 using JHipsterNet.Config;
 using Microsoft.Extensions.Options;
 
-namespace MyCompany.Controllers
+namespace <%= namespace %>.Controllers
 {
     [Route("")]
     [ApiController]

generators/server/templates/dotnetcore/test/Project.Test/Controllers/AccountControllerTest.cs.ejs

@@ -4,12 +4,12 @@ using System.Security.Claims;
 using System.Security.Principal;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using MyCompany.Controllers;
-using MyCompany.Security;
-using MyCompany.Service.Dto;
+using <%= namespace %>.Controllers;
+using <%= namespace %>.Security;
+using <%= namespace %>.Service.Dto;
 using Xunit;
 
-namespace MyCompany.Test.Controllers
+namespace <%= namespace %>.Test.Controllers
 {
     public class AccountControllerTest
     {

generators/server/templates/dotnetcore/test/Project.Test/Controllers/ProfileInfoControllerIntTest.cs.ejs

@@ -13,14 +13,14 @@
  limitations under the License.
 -%>
 using FluentAssertions;
-using MyCompany.Test.Setup;
+using <%= namespace %>.Test.Setup;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace MyCompany.Test.Controllers {
+namespace <%= namespace %>.Test.Controllers {
     public class ProfileInfoControllerIntTest
     {