Fixing issues with generated association mappings

Author: ngbsn

src/main/java/org/ngbsn/generator/AssociationMappingsGenerator.java

@@ -43,27 +43,28 @@ public static void generateMappings(final Table table) {
                 Table table1 = tablesMap.get(foreignKeyConstraintList.get(0).getReferencedTableName());
                 Table table2 = tablesMap.get(foreignKeyConstraintList.get(1).getReferencedTableName());
 
+                //Adding @ManyToMany and @JoinTable to table1
                 Column column1 = new Column();
-                column1.setFieldName(table2.getClassName().toLowerCase());
+                column1.setFieldName(CaseUtils.toCamelCase(table2.getName(), false, '_'));
                 column1.setType(table2.getClassName());
                 column1.getAnnotations().add(ManyToManyAnnotation.builder().build().toString());
-
                 Set<JoinColumnAnnotation> joinColumnAnnotations = new HashSet<>();
                 for (String column : foreignKeyConstraintList.get(0).getColumns()) {
                     joinColumnAnnotations.add(JoinColumnAnnotation.builder().name(column).build());
                 }
-
                 Set<JoinColumnAnnotation> joinInverseColumnAnnotations = new HashSet<>();
                 for (String column : foreignKeyConstraintList.get(1).getColumns()) {
                     joinInverseColumnAnnotations.add(JoinColumnAnnotation.builder().name(column).build());
                 }
-
                 column1.getAnnotations().add(JoinTableAnnotation.builder().tableName(table.getName()).joinColumns(joinColumnAnnotations).inverseJoinColumns(joinInverseColumnAnnotations).build().toString());
+                table1.getColumns().add(column1);
 
+                //Adding @ManyToMany(mappedBy) to table2
                 Column column2 = new Column();
-                column2.setFieldName(table1.getClassName().toLowerCase());
+                column2.setFieldName(CaseUtils.toCamelCase(table1.getName(), false, '_'));
                 column2.setType(table1.getClassName());
-                column2.getAnnotations().add(ManyToManyAnnotation.builder().mappedBy(column1.getFieldName()).toString());
+                column2.getAnnotations().add(ManyToManyAnnotation.builder().mappedBy(column1.getFieldName()).build().toString());
+                table2.getColumns().add(column2);
 
             } else {
                 //Case1: There are some fields that are not foreign keys. So separate entity is needed to track Link Table
@@ -80,13 +81,13 @@ public static void generateMappings(final Table table) {
     private static void addBothUnidirectionalMappings(Table table, ForeignKeyConstraint foreignKeyConstraint) {
         Table referencedTable = tablesMap.get(foreignKeyConstraint.getReferencedTableName());
         Column foreignKeyColumn = new Column();
-        foreignKeyColumn.setFieldName(referencedTable.getClassName().toLowerCase());
+        foreignKeyColumn.setFieldName(CaseUtils.toCamelCase(referencedTable.getName(), false, '_'));
         foreignKeyColumn.setType(referencedTable.getClassName());
         foreignKeyColumn.getAnnotations().add(new ManyToOneAnnotation().toString());
         table.getColumns().add(foreignKeyColumn);
 
         Column childKeyColumn = new Column();
-        childKeyColumn.setFieldName(table.getClassName().toLowerCase());
+        childKeyColumn.setFieldName(CaseUtils.toCamelCase(table.getName(), false, '_'));
         childKeyColumn.setType("Set<" + table.getClassName() + ">");
         childKeyColumn.getAnnotations().add(OneToManyAnnotation.builder().mappedBy(foreignKeyColumn.getFieldName()).build().toString());
         referencedTable.getColumns().add(childKeyColumn);

src/main/java/org/ngbsn/model/annotations/fieldAnnotations/JoinTableAnnotation.java

@@ -16,10 +16,10 @@ public class JoinTableAnnotation implements Annotation {
     public String toString() {
         return "@JoinTable(name = \"" + tableName
                 + "\", "
-                + "joinColumns = {\""
+                + "joinColumns = {"
                 + joinColumns.stream().map(JoinColumnAnnotation::toString).collect(Collectors.joining("," + System.lineSeparator()))
                 + "}, "
-                + "inverseJoinColumns = {\""
+                + "inverseJoinColumns = {"
                 + inverseJoinColumns.stream().map(JoinColumnAnnotation::toString).collect(Collectors.joining("," + System.lineSeparator()))
                 + "})";
     }

src/test/resources/sql/organization.sql

@@ -3,7 +3,7 @@ CREATE TABLE organization.contractors (
     birth_date      DATE            NOT NULL,
     first_name      VARCHAR(14)     NOT NULL,
     last_name       VARCHAR(16)     NOT NULL,
-    hire_date       DATE            NOT NULL,
+    hire_date       DATE,
     PRIMARY KEY (contractor_no, first_name)
 );
 
@@ -26,8 +26,6 @@ CREATE TABLE organization.departments (
 CREATE TABLE organization.dept_manager (
    dept_no      CHAR(4)         NOT NULL,
    emp_no       INT             NOT NULL,
-   from_date    DATE            NOT NULL,
-   to_date      DATE            NOT NULL,
    FOREIGN KEY (emp_no)  REFERENCES organization.employees (emp_no)    ON DELETE CASCADE,
    FOREIGN KEY (dept_no) REFERENCES organization.departments (dept_no) ON DELETE CASCADE,
    PRIMARY KEY (emp_no,dept_no)